Merge pull request #176 from roc-lang/syntax-update

Header syntax update
roc-lang · May 3, 2024 · 004c23a · 004c23a
2 parents ac1ea71 + 507a0c6
commit 004c23a
Show file tree

Hide file tree

Showing 27 changed files with 133 additions and 180 deletions.
diff --git a/examples/Arithmetic/main.roc b/examples/Arithmetic/main.roc
@@ -1,11 +1,8 @@
-app "arithmetic"
-    packages { pf: "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
-    imports [
-        pf.Stdout,
-        pf.Task,
-        pf.Arg,
-    ]
-    provides [main] to pf
+app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
+
+import pf.Stdout
+import pf.Task
+import pf.Arg
 
 TaskErrors : [InvalidArg, InvalidNumStr]
 

diff --git a/examples/BasicDict/BasicDict.roc b/examples/BasicDict/BasicDict.roc
@@ -1,6 +1,4 @@
-interface BasicDict
-    exposes []
-    imports []
+module []
 
 # the dictionary type is: Dict key value
 # Both key and value are type variables

diff --git a/examples/CommandLineArgs/main.roc b/examples/CommandLineArgs/main.roc
@@ -1,16 +1,13 @@
 # Run with `roc ./examples/CommandLineArgs/main.roc -- examples/CommandLineArgs/input.txt`
-app "command-line-args"
-    packages {
-        pf: "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br",
-    }
-    imports [
-        pf.Stdout,
-        pf.File,
-        pf.Path,
-        pf.Task,
-        pf.Arg,
-    ]
-    provides [main] to pf
+app [main] {
+    pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br",
+}
+
+import pf.Stdout
+import pf.File
+import pf.Path
+import pf.Task
+import pf.Arg
 
 main =
     finalTask =

diff --git a/examples/DotNetPlatform/main.roc b/examples/DotNetPlatform/main.roc
@@ -1,6 +1,3 @@
-app "dotnetapp"
-    packages { platform: "./platform/main.roc" }
-    imports []
-    provides [main] to platform
+app [main] { platform: platform "./platform/main.roc" }
 
 main = "Hi from roc! (in a .NET platform) 🔥🦅🔥"
diff --git a/examples/EncodeDecode/main.roc b/examples/EncodeDecode/main.roc
@@ -1,17 +1,11 @@
-app "example"
-    packages {
-        pf: "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br",
-        json: "https://github.com/lukewilliamboswell/roc-json/releases/download/0.7.0/xuaMzXRVG_SEhOFZucS3iBozlRdObWsfKaYZMHVE_q0.tar.br",
-    }
-    imports [
-        pf.Stdout.{ line },
-        pf.Task,
-        json.Core.{ json },
-        Decode.{ Decoder, DecoderFormatting, DecodeResult, DecodeError },
-        Encode.{ Encoder, EncoderFormatting },
-    ]
-    provides [main] to pf
-
+app [main] {
+    pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br",
+    json: "https://github.com/Anton-4/roc-json/releases/download/patch26/L5rrSODQWRomTzNf3qeZmrTI6CUe5dqW6rd2m2Pp7Nc.tar.br",
+}
+
+import pf.Task
+import json.Core exposing [json]
+import pf.Stdout
 ### start snippet impl
 
 ItemKind := [

diff --git a/examples/FizzBuzz/main.roc b/examples/FizzBuzz/main.roc
@@ -1,7 +1,7 @@
-app "fizz-buzz"
-    packages { pf: "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
-    imports [pf.Stdout, pf.Task]
-    provides [main] to pf
+app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
+
+import pf.Stdout
+import pf.Task
 
 main =
     List.range { start: At 1, end: At 100 }

diff --git a/examples/GoPlatform/README.md b/examples/GoPlatform/README.md
@@ -72,10 +72,7 @@ $ roc build --bundle .tar.br platform/main.roc
 
 4. Now you can use the platform from inside a Roc file with:
 ```roc
-app "goUsingRocApp"
-    packages { pf: "YOUR_URL" }
-    imports []
-    provides [main] to pf
+app [goUsingRocApp] { pf: platform "YOUR_URL" }
 ```
 
 When running with a platform from a URL, the `--prebuilt-platform` flag is not needed.

diff --git a/examples/GoPlatform/main.roc b/examples/GoPlatform/main.roc
@@ -1,7 +1,4 @@
-app "rocLovesGo"
-    packages { pf: "platform/main.roc" }
-    imports []
-    provides [main] to pf
+app [main] { pf: platform "platform/main.roc" }
 
 # Can segfault on some Ubuntu 20.04 CI machines, see #164.
 main = "Roc <3 Go!\n"
diff --git a/examples/GraphTraversal/Graph.roc b/examples/GraphTraversal/Graph.roc
@@ -2,15 +2,13 @@
 ## using an [adjacency list](https://en.wikipedia.org/wiki/Adjacency_list)
 ## and exposes functions for working with graphs, such as creating one from a list and
 ## performing a depth-first or breadth-first search.
-interface Graph
-    exposes [
-        Graph,
-        fromList,
-        fromDict,
-        dfs,
-        bfs,
-    ]
-    imports []
+module [
+    Graph,
+    fromList,
+    fromDict,
+    dfs,
+    bfs,
+]
 
 ## Graph type representing a graph as a dictionary of adjacency lists,
 ## where each key is a vertex and each value is a list of its adjacent vertices.

diff --git a/examples/HelloWorld/main.roc b/examples/HelloWorld/main.roc
@@ -1,7 +1,7 @@
-app "hello-world"
-    packages { pf: "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
-    imports [pf.Stdout, pf.Task]
-    provides [main] to pf
+app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
+
+import pf.Stdout
+import pf.Task
 
 main =
     Stdout.line! "Hello, World!"
diff --git a/examples/IngestFiles/README.md b/examples/IngestFiles/README.md
@@ -1,12 +1,10 @@
 # Ingest Files
 
-Statically importing files as a `Str` or a `List U8`:
+Statically importing files as a `Str` or a `List U8` (list of bytes):
 
 ```roc
-imports [
-    "some-file" as someStr : Str,
-    "some-file" as someBytes : List U8,
-]
+import "some-file" as someStr : Str
+import "some-file" as someBytes : List U8
 ```
 
 ## Code

diff --git a/examples/IngestFiles/main.roc b/examples/IngestFiles/main.roc
@@ -1,11 +1,8 @@
-app "ingested-file"
-    packages { pf: "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
-    imports [
-        pf.Stdout,
-        pf.Task,
-        "sample.txt" as sample : Str,
-    ]
-    provides [main] to pf
+app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
+
+import pf.Stdout
+import pf.Task
+import "sample.txt" as sample : Str
 
 main =
     Stdout.line! "$(sample)"
diff --git a/examples/Json/main.roc b/examples/Json/main.roc
@@ -1,15 +1,12 @@
-app "json-basic"
-    packages {
-        cli: "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br",
-        json: "https://github.com/lukewilliamboswell/roc-json/releases/download/0.7.0/xuaMzXRVG_SEhOFZucS3iBozlRdObWsfKaYZMHVE_q0.tar.br",
-    }
-    imports [
-        cli.Stdout,
-        cli.Task,
-        json.Core.{ jsonWithOptions },
-        Decode.{ DecodeResult, fromBytesPartial },
-    ]
-    provides [main] to cli
+app [main] {
+    cli: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br",
+    json: "https://github.com/Anton-4/roc-json/releases/download/patch26/L5rrSODQWRomTzNf3qeZmrTI6CUe5dqW6rd2m2Pp7Nc.tar.br",
+}
+
+import cli.Stdout
+import cli.Task
+import json.Core exposing [jsonWithOptions]
+import Decode exposing [fromBytesPartial]
 
 main =
     requestBody = Str.toUtf8 "{\"Image\":{\"Animated\":false,\"Height\":600,\"Ids\":[116,943,234,38793],\"Thumbnail\":{\"Height\":125,\"Url\":\"http:\\/\\/www.example.com\\/image\\/481989943\",\"Width\":100},\"Title\":\"View from 15th Floor\",\"Width\":800}}"

diff --git a/examples/LeastSquares/main.roc b/examples/LeastSquares/main.roc
@@ -1,10 +1,7 @@
-app "example"
-    packages { pf: "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
-    imports [
-        pf.Stdout,
-        pf.Task,
-    ]
-    provides [main] to pf
+app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
+
+import pf.Stdout
+import pf.Task
 
 main =
     nStr = Num.toStr (leastSquareDifference {})

diff --git a/examples/MultipleRocFiles/Hello.roc b/examples/MultipleRocFiles/Hello.roc
@@ -1,7 +1,6 @@
-interface Hello
+module
     # Only what's in 'exposes' is accessible to other modules
-    exposes [hello]
-    imports []
+    [hello]
 
 hello : Str -> Str
 hello = \name ->

diff --git a/examples/MultipleRocFiles/README.md b/examples/MultipleRocFiles/README.md
@@ -1,6 +1,6 @@
 # Multiple Roc Files
 
-You can use Interface modules to organize your code into multiple files.
+You can use modules to organize your code into multiple files.
 
 ## Code
 

diff --git a/examples/MultipleRocFiles/main.roc b/examples/MultipleRocFiles/main.roc
@@ -1,8 +1,8 @@
-app "interface-modules"
-    packages { pf: "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
-    # we import Stdout from the platform and the Hello interface from the Hello.roc file
-    imports [pf.Stdout, pf.Task, Hello]
-    provides [main] to pf
+app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
+
+import pf.Stdout
+import pf.Task
+import Hello
 
 main =
     Stdout.line! (Hello.hello "World")
diff --git a/examples/Parser/main.roc b/examples/Parser/main.roc
@@ -1,15 +1,12 @@
-app "parser-basic"
-    packages {
-        cli: "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br",
-        parser: "https://github.com/lukewilliamboswell/roc-parser/releases/download/0.5.2/9VrPjwfQQ1QeSL3CfmWr2Pr9DESdDIXy97pwpuq84Ck.tar.br",
-    }
-    imports [
-        cli.Stdout,
-        cli.Task,
-        parser.Core.{ Parser, many, oneOf, map },
-        parser.String.{ parseStr, codeunit, anyCodeunit },
-    ]
-    provides [main] to cli
+app [main] {
+    cli: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br",
+    parser: "https://github.com/lukewilliamboswell/roc-parser/releases/download/0.5.2/9VrPjwfQQ1QeSL3CfmWr2Pr9DESdDIXy97pwpuq84Ck.tar.br",
+}
+
+import cli.Stdout
+import cli.Task
+import parser.Core exposing [Parser, many, oneOf, map]
+import parser.String exposing [parseStr, codeunit, anyCodeunit]
 
 main =
     many letterParser

diff --git a/examples/PatternMatching/PatternMatching.roc b/examples/PatternMatching/PatternMatching.roc
@@ -1,6 +1,4 @@
-interface PatternMatching
-    exposes []
-    imports []
+module []
 
 # Match an empty list
 expect

diff --git a/examples/RandomNumbers/main.roc b/examples/RandomNumbers/main.roc
@@ -1,14 +1,11 @@
-app "random-numbers"
-    packages {
-        pf: "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br",
-        rand: "https://github.com/lukewilliamboswell/roc-random/releases/download/0.0.1/x_XwrgehcQI4KukXligrAkWTavqDAdE5jGamURpaX-M.tar.br",
-    }
-    imports [
-        pf.Stdout,
-        pf.Task,
-        rand.Random,
-    ]
-    provides [main] to pf
+app [main] {
+    pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br",
+    rand: "https://github.com/lukewilliamboswell/roc-random/releases/download/0.0.1/x_XwrgehcQI4KukXligrAkWTavqDAdE5jGamURpaX-M.tar.br",
+}
+
+import pf.Stdout
+import pf.Task
+import rand.Random
 
 # Print a list of 10 random numbers in the range 25-75 inclusive.
 main =

diff --git a/examples/RecordBuilder/IDCounter.roc b/examples/RecordBuilder/IDCounter.roc
@@ -1,11 +1,9 @@
-interface IDCounter
-    exposes [
-        IDCount,
-        initIDCount,
-        incID,
-        extractState,
-    ]
-    imports []
+module [
+    IDCount,
+    initIDCount,
+    incID,
+    extractState,
+]
 
 ID : U32
 

diff --git a/examples/TaskLoop/main.roc b/examples/TaskLoop/main.roc
@@ -1,9 +1,11 @@
-app "task-usage"
-    packages {
-        pf: "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br",
-    }
-    imports [pf.Stdin, pf.Stdout, pf.Stderr, pf.Task.{ Task }]
-    provides [main] to pf
+app [main] {
+    pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br",
+}
+
+import pf.Stdin
+import pf.Stdout
+import pf.Stderr
+import pf.Task exposing [Task]
 
 main = run |> Task.onErr printErr
 

diff --git a/examples/Tasks/main.roc b/examples/Tasks/main.roc
@@ -1,9 +1,17 @@
-app "task-usage"
-    packages {
-        pf: "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br",
-    }
-    imports [pf.Stdout, pf.Stderr, pf.Arg, pf.Env, pf.Http, pf.Dir, pf.Utc, pf.File, pf.Path.{ Path }, pf.Task.{ Task }]
-    provides [main] to pf
+app [main] {
+    pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br",
+}
+
+import pf.Stdout
+import pf.Stderr
+import pf.Arg
+import pf.Env
+import pf.Http
+import pf.Dir
+import pf.Utc
+import pf.File
+import pf.Path exposing [Path]
+import pf.Task exposing [Task]
 
 main : Task {} _
 main = run |> Task.onErr handleErr
@@ -27,11 +35,9 @@ run =
     # Fetch the provided url using HTTP
     strHTML = fetchHtml! url
     Stdout.line! "Saving url HTML to $(Path.display outputPath)..."
-
     # Write HTML string to a file
     File.writeUtf8 outputPath strHTML
         |> Task.onErr! \_ -> Task.err (FailedToWriteFile outputPath)
-
     # Print contents of current working directory
     listCwdContent
         |> Task.map \dirContents ->

diff --git a/examples/TowersOfHanoi/Hanoi.roc b/examples/TowersOfHanoi/Hanoi.roc
@@ -1,8 +1,6 @@
-interface Hanoi
-    exposes [
-        hanoi,
-    ]
-    imports []
+module [
+    hanoi,
+]
 
 ## Solves the Tower of Hanoi problem using recursion. Returns a list of moves
 ## which represent the solution.