Merge pull request #14 from Cirru/update

reduce dir; try using syntax

Author: NoEgAm

README.md

@@ -6,14 +6,23 @@ Docs: https://mooncakes.io/docs/#/tiye/cirru-parser/lib/members
 moon add tiye/cirru-parser
 ```
 
+import in `moon.pkg.json`:
+
+```js
+    {
+      "path": "tiye/cirru-parser",
+      "alias": "cirru_parser"
+    }
+```
+
 ```moonbit
-typealias @cirru_parser.Cirru
+using @cirru_parser {type Cirru}
 
 // parse Cirru code
-Cirru::parse(code: String) : Array[Cirru]!CirruParseError
+Cirru::parse(code: String) : Array[Cirru] raise CirruParseError
 
 // format Cirru code
-Cirru::format(cirru: Array[Cirru], {use_inline: false}) : String!FormatCirruError
+Cirru::format(cirru: Array[Cirru], use_inline=false) : String raise FormatCirruError
 ```
 
 ### License

moon.mod.json

@@ -1,6 +1,6 @@
 {
   "name": "tiye/cirru-parser",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "deps": {},
   "readme": "README.md",
   "repository": "https://github.com/Cirru/parser.mbt",

src/lib/moon.pkg.json

@@ -1,5 +1,5 @@
 ///|
-typealias @lib.Cirru
+using @lib {type Cirru}
 
 ///|
 pub fn main_parser() -> Unit {
@@ -38,7 +38,7 @@ pub fn main_writer() -> Unit {
   for item in tree {
     println(item.to_json().stringify())
   }
-  let ret = (try? Cirru::format(tree, { use_inline: false })).unwrap()
+  let ret = (try? Cirru::format(tree, use_inline=false)).unwrap()
   println("Generated:")
   println(ret)
   println("Expected:")

src/main/main.mbt

@@ -1,5 +1,10 @@
 {
   "is-main": true,
-  "import": ["tiye/cirru-parser/lib"],
+  "import": [
+    {
+      "path": "tiye/cirru-parser",
+      "alias": "lib"
+    }
+  ],
   "test-import": []
 }

src/main/moon.pkg.json

@@ -0,0 +1,9 @@
+{
+  "import": [],
+  "test-import": [
+    {
+      "path": "tiye/cirru-parser",
+      "alias": "lib"
+    }
+  ]
+}

src/moon.pkg.json

@@ -1,5 +1,5 @@
 ///|
-typealias @lib.Cirru
+using @lib {type Cirru}
 
 ///|
 test "parser" {
@@ -20,9 +20,7 @@ test "existed demos" {
     let defined = (try? @json.parse(json_file)).unwrap()
     let defined_str = defined.stringify()
     assert_eq(tree, defined_str)
-    let formatted = Cirru::format(@json.from_json(defined), {
-      use_inline: false,
-    })
+    let formatted = Cirru::format(@json.from_json(defined), use_inline=false)
     let ret = (try? Cirru::parse(formatted)).unwrap().to_json().stringify()
     assert_eq(ret, defined_str)
   }

src/lib/parser.mbt src/parser.mbtsrc/lib/parser.mbt renamed to src/parser.mbt

@@ -14,7 +14,7 @@ pub fn format_to_lisp(xs : Array[Cirru]) -> String raise FormatError {
 ///|
 /// format single expression to Lisp-like code
 fn format_lispy_expr(self : Cirru, indent : Int) -> String raise FormatError {
-  let emptySpace = " "
+  let empty_space = " "
   match self {
     List(xs) =>
       if xs.length() > 0 && xs[0].is_comment() {
@@ -26,17 +26,17 @@ fn format_lispy_expr(self : Cirru, indent : Int) -> String raise FormatError {
         }
 
         // chunk = format!("{}{}", chunk.trim_end(), gen_newline(indent));
-        chunk = "\{chunk.trim_end(emptySpace)}\{gen_newline(indent)}"
+        chunk = "\{chunk.trim_end(char_set=empty_space)}\{gen_newline(indent)}"
         chunk
       } else {
         let mut chunk = "("
         for idx, x in xs {
           if x.is_nested() {
-            chunk = "\{chunk.trim_end(emptySpace)}\{gen_newline(indent + 1)}"
+            chunk = "\{chunk.trim_end(char_set=empty_space)}\{gen_newline(indent + 1)}"
           }
           let next = x.format_lispy_expr(indent + 1)
           if next.has_prefix("\n") {
-            chunk = "\{chunk.trim_end(emptySpace)}\{next}"
+            chunk = "\{chunk.trim_end(char_set=empty_space)}\{next}"
           } else {
             chunk = "\{chunk}\{next}"
           }
@@ -53,7 +53,8 @@ fn format_lispy_expr(self : Cirru, indent : Int) -> String raise FormatError {
       } else {
         let s0 = token[0]
         if s0 == '|' || s0 == '"' {
-          "\"" + escape_string(token.substring(start=1)) + "\""
+          let sliced = (try? token[1:]).unwrap().to_string()
+          "\"" + escape_string(sliced) + "\""
         } else if token.contains(" ") ||
           token.contains("\n") ||
           token.contains("\"") {