0.6.3 / 2018-01-30

================ * Closes #270 bugfix type aliases recompilation (#271) * Moduledoc for the example (#269)
wende · Jan 30, 2018 · 2797d1f · 2797d1f
1 parent a310eca
commit 2797d1f
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 39 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -17,7 +17,7 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.11.0/styles/atom-one-dark.min.css" />
     <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" />
     <link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,700" rel="stylesheet" />
-<link href="static/css/main.96aedc4d.css" rel="stylesheet"></head>
+<link href="static/css/main.9f997fe0.css" rel="stylesheet"></head>
 
 <body>
     <a href="https://github.com/wende/elchemy" class="github-corner" aria-label="View source on Github">
@@ -174,6 +174,6 @@ <h1>Try online now! (Seriously, just write anything below)</h1>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.11.0/languages/elixir.min.js"></script>
     <script src="elm.js" crossorigin="anonymous"></script>
     <script src="index.js" crossorigin="anonymous"></script>
-<script type="text/javascript" src="static/js/main.96aedc4d.js"></script></body>
+<script type="text/javascript" src="static/js/main.9f997fe0.js"></script></body>
 
 </html>
diff --git a/docs/stable/elm.js b/docs/stable/elm.js
@@ -19744,8 +19744,8 @@ var _user$project$Compiler$parse = F2(
 					return _elm_lang$core$Native_Utils.crash(
 						'Compiler',
 						{
-							start: {line: 230, column: 17},
-							end: {line: 230, column: 28}
+							start: {line: 216, column: 17},
+							end: {line: 216, column: 28}
 						})(
 						A2(
 							_elm_lang$core$Basics_ops['++'],
@@ -19786,8 +19786,8 @@ var _user$project$Compiler$parse = F2(
 		return _elm_lang$core$Native_Utils.crashCase(
 			'Compiler',
 			{
-				start: {line: 221, column: 5},
-				end: {line: 246, column: 39}
+				start: {line: 207, column: 5},
+				end: {line: 232, column: 39}
 			},
 			_p1)(
 			_elm_lang$core$Basics$toString(_p1));
@@ -19823,35 +19823,20 @@ var _user$project$Compiler$getContext = function (statements) {
 		};
 	}
 };
-var _user$project$Compiler$typeAliasDuplicate = F3(
-	function (k, v, v2) {
-		return (!_elm_lang$core$Native_Utils.eq(v, v2)) ? _elm_lang$core$Native_Utils.crash(
-			'Compiler',
-			{
-				start: {line: 167, column: 9},
-				end: {line: 167, column: 20}
-			})(
-			A2(
-				_elm_lang$core$Basics_ops['++'],
-				'You can\'t have two different type aliases for ',
-				A2(
-					_elm_lang$core$Basics_ops['++'],
-					_elm_lang$core$Basics$toString(k),
-					A2(
-						_elm_lang$core$Basics_ops['++'],
-						'\nThese are: ',
-						A2(
-							_elm_lang$core$Basics_ops['++'],
-							_elm_lang$core$Basics$toString(v),
-							A2(
-								_elm_lang$core$Basics_ops['++'],
-								'\nand\n',
-								_elm_lang$core$Basics$toString(v2))))))) : A2(_elm_lang$core$Dict$insert, k, v);
-	});
 var _user$project$Compiler$getCommonImports = function (commons) {
 	var merge = F2(
 		function (aliases, acc) {
-			return A6(_elm_lang$core$Dict$merge, _elm_lang$core$Dict$insert, _user$project$Compiler$typeAliasDuplicate, _elm_lang$core$Dict$insert, acc, aliases, _elm_lang$core$Dict$empty);
+			return A6(
+				_elm_lang$core$Dict$merge,
+				_elm_lang$core$Dict$insert,
+				F3(
+					function (k, v, v2) {
+						return A2(_elm_lang$core$Dict$insert, k, v);
+					}),
+				_elm_lang$core$Dict$insert,
+				acc,
+				aliases,
+				_elm_lang$core$Dict$empty);
 		});
 	return A3(
 		_elm_lang$core$List$foldl,
@@ -19887,7 +19872,7 @@ var _user$project$Compiler$glueStart = A2(
 	_elm_lang$core$Basics_ops['++'],
 	_user$project$Helpers$ind(0),
 	A2(_elm_lang$core$Basics_ops['++'], 'use Elchemy', '\n'));
-var _user$project$Compiler$version = '0.6.2';
+var _user$project$Compiler$version = '0.6.3';
 var _user$project$Compiler$getCode = F2(
 	function (context, statements) {
 		var shadowsBasics = _user$project$ExContext$importBasicsWithoutShadowed(context);

diff --git a/elchemy b/elchemy
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 
-version="0.6.2"
+version="0.6.3"
 set -e
 
 VERBOSE=false

diff --git a/elchemy-core b/elchemy-core
diff --git a/mix.exs b/mix.exs
@@ -5,7 +5,7 @@ defmodule Elchemy.Mixfile do
     [app: :elchemy,
      name: "Elchemy Compiler",
      description: "Mix compiler wrapper around Elchemy project",
-     version: "0.6.2",
+     version: "0.6.3",
      elixir: "~> 1.4",
      description: "",
      package: package(),
@@ -35,11 +35,11 @@ defmodule Elchemy.Mixfile do
 
   # Dependencies can be Hex packages:
   #
-  #   {:my_dep, "~> 0.6.2"}
+  #   {:my_dep, "~> 0.6.3"}
   #
   # Or git/path repositories:
   #
-  #   {:my_dep, git: "https://github.com/elixir-lang/my_dep.git", tag: "0.6.2"}
+  #   {:my_dep, git: "https://github.com/elixir-lang/my_dep.git", tag: "0.6.3"}
   #
   # Type "mix help deps" for more examples and options
   defp deps do

diff --git a/src/Compiler.elm b/src/Compiler.elm
@@ -20,7 +20,7 @@ import Regex exposing (Regex, HowMany(..), regex)
 -}
 version : String
 version =
-    "0.6.2"
+    "0.6.3"
 
 
 glueStart : String
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ import Regex exposing (Regex, HowMany(..), regex) @@
     -}
     version : String
     version =
-        "0.6.2"
+        "0.6.3"
     glueStart : String
@@ Expand Down @@