From 2797d1f9b0151fd0482fd68a58e09cffa138f065 Mon Sep 17 00:00:00 2001 From: Krzysztof Wende Date: Tue, 30 Jan 2018 21:14:15 +0100 Subject: [PATCH] 0.6.3 / 2018-01-30 ================ * Closes #270 bugfix type aliases recompilation (#271) * Moduledoc for the example (#269) --- docs/index.html | 4 ++-- docs/stable/elm.js | 47 ++++++++++++++++------------------------------ elchemy | 2 +- elchemy-core | 2 +- mix.exs | 6 +++--- src/Compiler.elm | 2 +- 6 files changed, 24 insertions(+), 39 deletions(-) diff --git a/docs/index.html b/docs/index.html index b3ca5b4..4086519 100644 --- a/docs/index.html +++ b/docs/index.html @@ -17,7 +17,7 @@ - + @@ -174,6 +174,6 @@

Try online now! (Seriously, just write anything below)

- + \ No newline at end of file diff --git a/docs/stable/elm.js b/docs/stable/elm.js index 69b3a5a..e87256f 100644 --- 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 index 05b8a0e..01a3097 100755 --- 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 index 88a3735..e3cc1d7 160000 --- a/elchemy-core +++ b/elchemy-core @@ -1 +1 @@ -Subproject commit 88a3735451ecc286755112dc7e188e44c652c6d1 +Subproject commit e3cc1d7029cf2ed1df602f7c43f6fe98470ab3ed diff --git a/mix.exs b/mix.exs index 3e5e2aa..3a5f841 100644 --- 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 index 24567e1..a9a3e17 100644 --- 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