Merge pull request #8 from Cirru/update

reduce dir; try using syntax

Author: NoEgAm

README.md

@@ -8,9 +8,13 @@ moon install tiye/cirru-edn
 
 import it as `edn`:
 
+```js
+"import": [{ "path": "tiye/cirru-edn", "alias": "edn" }],
+```
+
 ```moonbit
-typealias @edn.Edn
-match Edn::parse?(demo) {
+using @edn {type Edn}
+match (try? Edn::parse(demo)) {
   Ok(x) => {
     println(x.to_string())
     println(x.format?(use_inline=false).unwrap())
@@ -22,7 +26,7 @@ match Edn::parse?(demo) {
 Or parse with `@strconv.parse!`:
 
 ```moonbit
-let parsed : Edn = @strconv.parse!("atom 1")
+let parsed : Edn = try! @strconv.from_str("atom 1")
 
 parsed.format?(use_inline=false).unwrap() // "atom 1"
 ```

moon.mod.json

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

src/lib/any-ref.mbt src/any-ref.mbtsrc/lib/any-ref.mbt renamed to src/any-ref.mbt

@@ -0,0 +1,7 @@
+///|
+test "atom inside edn" {
+  let edn = @cirru_edn.Edn::Atom(Number(1.0))
+  assert_eq(edn.format(use_inline=true).trim(char_set="\n"), "atom 1")
+  let parsed : Edn = @strconv.from_str("atom 1")
+  assert_eq(parsed, @cirru_edn.Atom(Number(1.0)))
+}

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

@@ -1,12 +1,12 @@
 ///|
-typealias @cirru_parser.Cirru
+using @cirru_parser {type Cirru}
 
 ///|
 pub(all) suberror EdnCommonError String derive(Eq, Hash, Default, Show)
 
 ///|
-pub impl @strconv.FromStr for Edn with from_string(s) {
-  Edn::parse(s)
+pub impl @strconv.FromStr for Edn with from_str(s) {
+  Edn::parse(s.to_string())
 }
 
 ///|
@@ -39,11 +39,12 @@ fn extract_cirru_edn(
         "" => raise @strconv.StrConvError("empty string is invalid for edn")
         s1 =>
           match s1.get_char(0).unwrap() {
-            '\'' => Symbol(s1.substring(start=1))
-            ':' => Tag(s1.substring(start=1))
-            '"' | '|' => Str(s1.substring(start=1))
+            '\'' => Symbol(try! s1[1:].to_string())
+            ':' => Tag(try! s1[1:].to_string())
+            '"' | '|' => Str(try! s1[1:].to_string())
             _ =>
-              match (try? @strconv.parse_double(s1.trim(" ").to_string())) {
+              match
+                (try? @strconv.parse_double(s1.trim(char_set=" ").to_string())) {
                 Ok(f) => Number(f)
                 Err(e) =>
                   match e {
@@ -176,7 +177,8 @@ fn extract_cirru_edn(
               "%{}" =>
                 if xs.length() >= 3 {
                   let name = match xs[1] {
-                    Leaf(s) => EdnTag::new(s.trim_start(":").to_string())
+                    Leaf(s) =>
+                      EdnTag::new(s.trim_start(char_set=":").to_string())
                     List(e) =>
                       raise @strconv.StrConvError(
                         "expected record name in string: " + e.to_string(),
@@ -197,7 +199,12 @@ fn extract_cirru_edn(
                           match (ys[0], try? extract_cirru_edn(ys[1])) {
                             (Leaf(s), Ok(v)) =>
                               entries.push(
-                                (EdnTag::new(s.trim_start(":").to_string()), v),
+                                (
+                                  EdnTag::new(
+                                    s.trim_start(char_set=":").to_string(),
+                                  ),
+                                  v,
+                                ),
                               )
                             (Leaf(s), Err(e)) =>
                               raise @strconv.StrConvError(
@@ -378,14 +385,11 @@ fn assemble_cirru_node(data : Edn) -> @cirru_parser.Cirru raise EdnCommonError {
 /// generate Cirru code from Edn
 pub fn Edn::format(
   data : Self,
-  use_inline? : Bool,
+  use_inline? : Bool = false,
 ) -> String raise EdnCommonError {
-  let options : @cirru_parser.CirruWriterOptions = {
-    use_inline: use_inline.unwrap_or(false),
-  }
   let ret = match assemble_cirru_node(data) {
-    Leaf(s) => try? Cirru::format([List([Leaf("do"), Leaf(s)])], options)
-    List(xs) => try? Cirru::format([List(xs)], options)
+    Leaf(s) => try? Cirru::format([List([Leaf("do"), Leaf(s)])], use_inline~)
+    List(xs) => try? Cirru::format([List(xs)], use_inline~)
   }
   match ret {
     Ok(s) => s