Merge branch 'master' into char-escapes

Author: aaronjanse

.travis.yml

@@ -4,7 +4,6 @@ node_js:
   lts/*
 
 before_install:
-  - npm install -g [email protected] [email protected]
-
-script: make && make test
+  - npm install -g [email protected] [email protected] [email protected]
 
+script: make && make test && make lint

Makefile

@@ -12,3 +12,12 @@ build:
 test:
 	elm make src/library/Todo.elm --output /dev/null # build the library just to test it compiles
 	elm-test
+
+.PHONY: format
+format:
+	elm-format . --yes
+
+
+.PHONY: lint
+lint:
+	elm-format . --validate

README.md

@@ -70,7 +70,7 @@ Oh God please yes! :heart: Feel free to look around the [<kbd>help wanted</kbd>]
 
 |                   | parser tests         | parse                | desugar            | infer types        | optimize             | emit               | emit tests         |
 | ----------------- | -------------------- | -------------------- | ------------------ | ------------------ | -------------------- | ------------------ | ------------------ |
-| integers          | :heavy_check_mark:   | :warning: [[1]](#f1) | :heavy_check_mark: | :heavy_check_mark: | :warning: [[2]](#f2) | :heavy_check_mark: | :heavy_check_mark: |
+| integers          | :heavy_check_mark:   | :heavy_check_mark:   | :heavy_check_mark: | :heavy_check_mark: | :warning: [[2]](#f2) | :heavy_check_mark: | :heavy_check_mark: |
 | floats            | :x: [[3]](#f3)       | :x: [[4]](#f4)       | :x: [[3]](#f3)     | :x: [[3]](#f3)     | :x: [[5]](#f5)       | :x: [[3]](#f3)     | :x: [[3]](#f3)     |
 | characters        | :heavy_check_mark:   | :heavy_check_mark:   | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:   | :heavy_check_mark: | :heavy_check_mark: |
 | strings           | :warning: [[6]](#f6) | :warning: [[7]](#f7) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:   | :heavy_check_mark: | :heavy_check_mark: |
@@ -94,7 +94,6 @@ Oh God please yes! :heart: Feel free to look around the [<kbd>help wanted</kbd>]
 | custom operators  | :x:                  | :x:                  | :x:                | :x:                | :x:                  | :x:                | :x:                |
 | shaders (?)       | :x:                  | :x:                  | :x:                | :x:                | :x:                  | :x:                | :x:                |
 
-1. <span id="f1"></span> Hex integers not implemented; will be fixed in [#19](https://github.com/elm-in-elm/compiler/pull/19)
 2. <span id="f2"></span> To be optimized with multiplication, subtraction, division, modulo, exponentiation... maybe more?; not tracked yet
 3. <span id="f3"></span> Not implemented; tracked in [#17](https://github.com/elm-in-elm/compiler/issues/17)
 4. <span id="f4"></span> Not implemented; not tracked yet
@@ -108,7 +107,8 @@ The tooling around this project requires:
 
 * **`make`** for the [Makefile](Makefile)
 * **NodeJS 10+** for the [CLI tool](src/index.js)
-* **`elm`** and **`elm-test`**
+* **`elm`**, **`elm-test`** and **`elm-format`**
+
 
 or alternatively a good amount of ingenuity to do stuff in a different-than-planned way.
 
@@ -126,6 +126,14 @@ $ make test
 ```
 Runs `elm-test` on the test suite (gasp!)
 
+## Formatting code
+
+```
+$ make format 
+```
+Runs elm-format.
+Make sure to format code before submitting a pull request!
+
 ## Small TODOs
 
 >  This is a brain-dump of some low-level stuff. (High-level stuff should be in the roadmap.) My apologies if it's hard to make sense of this! ~janiczek
@@ -143,7 +151,6 @@ Runs `elm-test` on the test suite (gasp!)
 
 #### General
 
-- [ ] Nix expression for the dependencies and building this project? Would that be helpful?
 - [ ] Compare our `Main.compile` with official compiler's `Compile.compile` - is that a better API?
 - [ ] Types module: remove, refactor into "module per datastructure" style?
 - [ ] Deal with kernel modules
@@ -165,7 +172,6 @@ Runs `elm-test` on the test suite (gasp!)
 - [ ] Annotate type errors with position in source code (for better error messages)
 - [ ] Try to find a better name for "occurs check" and make the error message easier to understand
 - [ ] Document the typechecking stages better (ie. at all)
-- [ ] Find a (probably monadic) abstraction for `assignIds` so we don't have to thread the state in such a way. (This might not be possible because of lack of do notation. Ie. callback hell would always have to happen... Dunno!) For example see `Stage.InferTypes.assignIdsHelp`, the `Canonical.Plus` case.
 - [ ] Rename types to be able to show nice type variables (ie. the classic `a` instead of `type #0` or something). `Stage.InferTypes.getType`
 
 #### Optimizations

elm.json

@@ -18,6 +18,7 @@
             "elm-community/graph": "6.0.0",
             "elm-community/maybe-extra": "5.0.0",
             "elm-community/result-extra": "2.2.1",
+            "rtfeldman/elm-hex": "1.0.0",
             "turboMaCk/any-dict": "1.0.1",
             "turboMaCk/any-set": "1.0.0"
         },
@@ -38,9 +39,8 @@
             "elm/virtual-dom": "1.0.2",
             "elm-community/json-extra": "4.0.0",
             "elm-community/list-extra": "8.2.0",
-            "rtfeldman/elm-hex": "1.0.0",
             "rtfeldman/elm-iso8601-date-strings": "1.1.2",
             "stil4m/structured-writer": "1.0.2"
         }
     }
-}
+}

example-project/src/Main.elm

@@ -2,8 +2,8 @@ module Main exposing (main)
 
 
 main =
-    let
-        x =
-            1
-    in
-    x
+    if 1 + 2 then
+        ()
+
+    else
+        True

shell.nix

@@ -0,0 +1,14 @@
+let
+  nixpkgs = (import <nixpkgs> {}).fetchFromGitHub {
+    owner = "nixOS";
+    repo = "nixpkgs-channels";
+    rev = "73392e79aa62e406683d6a732eb4f4101f4732be";
+    sha256 = "049fq37sxdn5iis7ni407j2jsfrxbb41pgv5zawi02qj47f74az9";
+  };
+in with import nixpkgs {};
+mkShell {
+    buildInputs = with elmPackages; [
+        nodejs-10_x
+        elm elm-test elm-format elm-analyse
+    ];
+}

src/compiler/AST/Typed.elm

@@ -3,6 +3,7 @@ module AST.Typed exposing
     , Expr_(..)
     , ProjectFields
     , lambda
+    , let_
     , transformAll
     , transformOnce
     )
@@ -63,6 +64,14 @@ lambda argument body argumentId =
         }
 
 
+let_ : AnyDict String VarName (Binding Expr) -> Expr -> Expr_
+let_ bindings body =
+    Let
+        { bindings = bindings
+        , body = body
+        }
+
+
 {-| A helper for the Transform library.
 -}
 recurse : (Expr -> Expr) -> Expr -> Expr

src/compiler/Common.elm

@@ -6,7 +6,6 @@ module Common exposing
     , filePathToString
     , mapBinding
     , moduleNameToString
-    , moduleNames
     , topLevelDeclarationToString
     , unalias
     , varNameToString
@@ -20,15 +19,12 @@ import Common.Types
         , FilePath(..)
         , Module
         , ModuleName(..)
-        , Modules
-        , Set_
         , TopLevelDeclaration
         , VarName(..)
         )
 import Dict.Any
 import Error exposing (Error(..), GeneralError(..))
 import Extra.Dict.Any
-import Set.Any
 
 
 filePathToString : FilePath -> String
@@ -41,18 +37,6 @@ moduleNameToString (ModuleName moduleName) =
     moduleName
 
 
-moduleNames : Modules expr -> Set_ ModuleName
-moduleNames program =
-    let
-        toSet : Modules expr -> Set_ ModuleName
-        toSet dict =
-            dict
-                |> Dict.Any.keys
-                |> Set.Any.fromList moduleNameToString
-    in
-    toSet program
-
-
 {-| Expects the source directory filepaths to be normalized so that there's no `/` at the end.
 -}
 expectedFilePath : FilePath -> ModuleName -> FilePath

src/compiler/Error.elm

@@ -39,7 +39,6 @@ type GeneralError
 
 type ParseError
     = ModuleNameDoesntMatchFilePath ModuleName FilePath
-    | FileNotFound FilePath
     | EmptySourceDirectories
     | InvalidElmJson JD.Error
     | ParseProblem (List (P.DeadEnd ParseContext ParseProblem))
@@ -48,6 +47,7 @@ type ParseError
 type ParseContext
     = InLiteral
     | InLiteralInt
+    | InHexInt
     | InExpr
     | InIf
     | InLet
@@ -78,7 +78,6 @@ type ParseProblem
     | ExpectingEqualsSign -- `x >=< 1`
     | ExpectingMinusSign -- `>-<42`
     | ExpectingInt
-    | ExpectingHexadecimals
     | ExpectingSingleQuote
     | ExpectingChar
     | ExpectingEscapeBackslash
@@ -101,10 +100,10 @@ type ParseProblem
     | ExpectingFalse
     | ExpectingLet
     | ExpectingIn
-    | ExpectingAtLeastOne
-    | ExpectingNewline
     | ExpectingUnit
+    | ExpectingHexPrefix
     | InvalidInt
+    | InvalidHexInt
     | CompilerBug String
 
 
@@ -113,10 +112,6 @@ type DesugarError
         { var : ( Maybe ModuleName, VarName )
         , module_ : ModuleName
         }
-    | AmbiguousVar
-        { var : ( Maybe ModuleName, VarName )
-        , module_ : ModuleName
-        }
 
 
 type TypeError
@@ -156,11 +151,6 @@ toString error =
                         ++ filePath
                         ++ "`."
 
-                FileNotFound (FilePath filePath) ->
-                    "File `"
-                        ++ filePath
-                        ++ "` not found."
-
                 EmptySourceDirectories ->
                     "Empty `sourceDirectories`!"
 
@@ -190,20 +180,6 @@ toString error =
                         ++ moduleName
                         ++ "`. Have you imported it?"
 
-                AmbiguousVar { var, module_ } ->
-                    let
-                        ( maybeModuleName, varName ) =
-                            var
-
-                        (ModuleName moduleName) =
-                            module_
-                    in
-                    "There are multiple definitions for variable `"
-                        ++ fullVarName maybeModuleName varName
-                        ++ "` in the module `"
-                        ++ moduleName
-                        ++ "`. Keep only one in the code! Maybe alias some imports to fix the collision?"
-
         TypeError typeError ->
             case typeError of
                 UnknownName (VarName varName) ->