core: Remove support for '-' escaping

Only support '+' escaping now.

Author: ingydotnet

core/src/yamlscript/resolver.clj

@@ -247,17 +247,16 @@
 (defn resolve-code-sequence [_]
   (die "Sequences (block and flow) not allowed in code mode"))
 
-(def esc1 #"^\+\ *[\`\!\@\#\%\&\*\-\{\[\|\:\'\"\,\?\>]")
-(def esc2 #"^-[\`\!\@\#\%\&\*\-\{\[\|\:\'\"\,\?]")
+(def esc #"^\+\ *[\`\!\@\#\%\&\*\-\{\[\|\:\'\"\,\?\>]")
 (defn resolve-code-scalar [node type style]
   (if type
     (set/rename-keys node {style type})
     (let [val (style node)]
       (case style
-        := (let [node  ;; Remove leading escape character from value
-                 (if (or (re-find esc1 val) (re-find esc2 val))
-                   (assoc node := (subs val 1))
-                   node)]
+        := (let [ ;; Remove leading escape character from value
+                 node (if (re-find esc val)
+                        (assoc node := (subs val 1))
+                        node)]
              (set/rename-keys node {style :expr}))
         :$ (set/rename-keys node {style :xstr})
         :' (set/rename-keys node {style :str})

core/test/compiler-stack.yaml

@@ -124,29 +124,29 @@
     (a b c)
 
 
-- name: Dot escaping
+- name: Plus escaping
   yamlscript: |
     --- !yamlscript/v0
-    map inc: -[2 4 6 8]
+    map inc: +[2 4 6 8]
   parse: |
     "+MAP", :! "yamlscript/v0"
     "=VAL", := "map inc"
-    "=VAL", := "-[2 4 6 8]"
+    "=VAL", := "+[2 4 6 8]"
     "-MAP"
   compose: |
     {:+ "code" :% [
       {:= "map inc"}
-      {:= "-[2 4 6 8]"} ]}
+      {:= "+[2 4 6 8]"} ]}
   print: |
     (map inc [2 4 6 8])
 
 
 - name: YS reader forms
   yamlscript: |
     --- !yamlscript/v0
-    prn: -["str" \\c 42 foo true false nil]
-    prn: -{:a 1 :c 2 :b 3}
-    prn: -"A longer string"
+    prn: +["str" \\c 42 foo true false nil]
+    prn: +{:a 1 :c 2 :b 3}
+    prn: +"A longer string"
   build: |
     {:xmap [
      {:Sym prn}
@@ -477,7 +477,7 @@
 - name: Support default fn arguments
   yamlscript: |
     !yamlscript/v0
-    defn foo(a b=42 c="OK"): -[c b a]
+    defn foo(a b=42 c="OK"): +[c b a]
   build: |
     {:xmap
      [[{:Sym defn} {:Sym foo} nil]
@@ -516,7 +516,7 @@
 - name: All args have defaults
   yamlscript: |
     !yamlscript/v0
-    defn foo(a=1 b=2 c=3): -[c b a]
+    defn foo(a=1 b=2 c=3): +[c b a]
   print: |
     (defn
      foo
@@ -1418,7 +1418,7 @@
     !yamlscript/v0:
     - 0
     - 1
-    - :: -[2 3 4]
+    - :: +[2 3 4]
     - 5
     - 5
     - ::: [6, 7, 8]
@@ -1432,7 +1432,7 @@
   yamlscript: |
     !yamlscript/v0:
     - 1
-    - :when x: -[2 3 4]
+    - :when x: +[2 3 4]
     - :when y:: [6, 7, 8]
     - 9
   clojure: |
@@ -1442,7 +1442,7 @@
 - name: Single '::' in a data mode sequence
   yamlscript: |
     !yamlscript/v0:
-    - :when x: -[2 3 4]
+    - :when x: +[2 3 4]
   clojure: |
     (concat (when x [2 3 4]))
 
@@ -1451,7 +1451,7 @@
   yamlscript: |
     !yamlscript/v0:
     a: 1
-    :when x: -{'b' 2}
+    :when x: +{'b' 2}
     :when y:: {c: 3}
     d: 4
   clojure: |

core/test/compiler.yaml

@@ -644,7 +644,7 @@
 - name: Single quoted string
   yamlscript: |
     !yamlscript/v0
-    say: -"123" + ' let''s go'
+    say: +"123" + ' let''s go'
     say: '123 let''s go'
   clojure: |
     (say (add+ "123" " let's go"))
@@ -683,7 +683,7 @@
 - name: Floating point numbers
   yamlscript: |
     !yamlscript/v0
-    =>: -[ -0.00 0.1 -1.2e3 2.3e-4 ]
+    =>: +[ -0.00 0.1 -1.2e3 2.3e-4 ]
   clojure: |
     [-0.0 0.1 -1200.0 2.3E-4]
 
@@ -732,8 +732,8 @@
   yamlscript: |
     !yamlscript/v0
     defn foo():
-      -[a b c] =: -[1 2 3]
-      -{:d d :e e} =: -{:d 4 :e 5}
+      +[a b c] =: +[1 2 3]
+      +{:d d :e e} =: +{:d 4 :e 5}
       =>: a + b + c
   clojure: |
     (defn
@@ -745,7 +745,7 @@
 - name: Destructuring def
   yamlscript: |
     !yamlscript/v0
-    -[a b c] =: -[1 2 3]
+    +[a b c] =: +[1 2 3]
   clojure: |
     (+def [a b c] [1 2 3])
 
@@ -833,7 +833,7 @@
 - name: Dot groupings in vectors
   yamlscript: |
     !yamlscript/v0
-    =>: -[a.3.b(x.y), c.4.d]
+    =>: +[a.3.b(x.y), c.4.d]
   clojure: |
     [(b (get+ a 3) (get+ x 'y)) (get+ (get+ c 4) 'd)]
 
@@ -871,47 +871,15 @@
     {"bar" 44}
 
 
-- name: Plus minus escaping of YAML syntax
+- name: Plus escaping of YAML syntax
   yamlscript: |
     !yamlscript/v0
-    =>: -'foo' * 3
-    =>: -"foo" * 3
+    =>: +'foo' * 3
+    =>: +"foo" * 3
     =>: +[foo] + [bar]
     =>: +
       {foo 1} + {bar 2}
-    foo: -|| bar
-  clojure: |
-    (mul+ "foo" 3)
-    (mul+ "foo" 3)
-    (add+ [foo] [bar])
-    (add+ {foo 1} {bar 2})
-    (foo || bar)
-
-
-- name: Plus escaping of YAML syntax
-  yamlscript: |
-    !yamlscript/v0
-    =>: -'foo' * 3
-    =>: -"foo" * 3
-    =>: -[foo] + [bar]
-    =>: -{foo 1} + {bar 2}
-    foo: +|| bar
-  clojure: |
-    (mul+ "foo" 3)
-    (mul+ "foo" 3)
-    (add+ [foo] [bar])
-    (add+ {foo 1} {bar 2})
-    (foo || bar)
-
-
-- name: Plus escaping of YAML syntax
-  yamlscript: |
-    !yamlscript/v0
-    =>: -'foo' * 3
-    =>: -"foo" * 3
-    =>: -[foo] + [bar]
-    =>: -{foo 1} + {bar 2}
-    foo: +|| bar
+    foo: + || bar
   clojure: |
     (mul+ "foo" 3)
     (mul+ "foo" 3)
@@ -1184,7 +1152,7 @@
   yamlscript: |
     !yamlscript/v0
     =>: "$1 $foo $2"
-    =>: -"$1$foo$2"
+    =>: +"$1$foo$2"
   clojure: |
     (str "$1 " foo " $2")
     (str "$1" foo "$2")
@@ -1212,8 +1180,8 @@
 - name: Escape pound and colon in ysexpr strings
   yamlscript: |
     !yamlscript/v0
-    say: -'foo \# bar :\ baz'
-    say: -"foo \# bar :\ baz"
+    say: +'foo \# bar :\ baz'
+    say: +"foo \# bar :\ baz"
   clojure: |
     (say "foo # bar : baz")
     (say "foo # bar : baz")
@@ -1415,7 +1383,7 @@
 - name: Seq destruct without []
   yamlscript: |
     !yamlscript/v0
-    a b c =: -[1 2 3]
+    a b c =: +[1 2 3]
   clojure: |
     (+def [a b c] [1 2 3])
 
@@ -1428,8 +1396,8 @@
     =>: a.b.:c:d
     =>: a.5:b
     =>: a(5):b
-    =>: -{}:a
-    =>: -[]:a
+    =>: +{}:a
+    =>: +[]:a
     =>: a:b?
     =>: a:b!
     =>: a:b+
@@ -1545,7 +1513,7 @@
 - name: Merge key in data mode
   yamlscript: |
     !yamlscript/v0/data
-    <<:: -[{:a 1 :b 2}]
+    <<:: +[{:a 1 :b 2}]
     :a: 3
   clojure: |
     (+merge {:-<< [{:a 1, :b 2}], :a 3})
@@ -1566,7 +1534,7 @@
 - name: Tag method call with data mode switch to code mode
   yamlscript: |
     !yamlscript/v0:
-    foo: !:merge: -[{:a 1 :b 2} {:a 3}]
+    foo: !:merge: +[{:a 1 :b 2} {:a 3}]
   clojure: |
     {"foo" (merge [{:a 1, :b 2} {:a 3}])}
 

core/test/runtime.yaml

@@ -10,8 +10,8 @@
       =>: "foo"
       =>: true
       =>: false
-      =>: -[1 2 3]
-      =>: -{:a 1 :b 2}
+      =>: +[1 2 3]
+      =>: +{:a 1 :b 2}
   eval: |
     [1 2.3 "foo" true false [1 2 3] {:a 1, :b 2}]
 
@@ -21,8 +21,8 @@
     vector:
       =>: 1 + 2
       =>: 1 + 2 + 3
-      =>: -"foo" + "bar"
-      =>: -[1 2] + [3 4]
+      =>: +"foo" + "bar"
+      =>: +[1 2] + [3 4]
   eval: |
     [3 6 "foobar" (1 2 3 4)]
 

core/test/transformer.yaml

@@ -210,6 +210,6 @@
   yamlscript: |
     !yamlscript/v0
     defn foo():
-      -[x *y] =: z
+      +[x *y] =: z
   clojure: |
     (defn foo [] (let [[x & y] z]))

sample/rosetta-code/hello-world.ys

@@ -7,11 +7,11 @@ say: 'Hello, world!'
 =>: say('Hello, world!')
 
 say:
-  -'Hello, ' +: 'world!'
+  +'Hello, ' +: 'world!'
 
-say: -'Hello, ' + 'world!'
+say: +'Hello, ' + 'world!'
 
-say: -'Hello,' 'world!'
+say: +'Hello,' 'world!'
 
 say 'Hello,': 'world!'
 

ys/test/cli-usage.t

@@ -4,7 +4,7 @@ use ys::taptest: :all
 
 VERSION =: '0.2.4'
 
-ROOT =: -"$DIR/../.."
+ROOT =: +"$DIR/../.."
 
 HELP =: |
 

ys/test/dot.t

@@ -13,13 +13,13 @@ test::
   want: null
 - code: nil.foo
   want: null
-- code: -{}.$NIL
+- code: +{}.$NIL
   want: null
-- code: -[].$NIL
+- code: +[].$NIL
   want: null
 - code: true.foo
   want: null
-- code: -"foo".foo
+- code: +"foo".foo
   want: null
 
 - code: (1 .. 20).partition(3 5)

ys/test/operators.t

@@ -55,19 +55,19 @@ test::
   want: AB
 - code: (\\A + 2) + 3
   want:: \\F
-- code: -{:a 1} + {:b 2} + {:c 3}
-  want:: -{:a 1 :b 2 :c 3}
-- code: -'J' + 5
+- code: +{:a 1} + {:b 2} + {:c 3}
+  want:: +{:a 1 :b 2 :c 3}
+- code: +'J' + 5
   want: J5
-- code: -'J' + \\5
+- code: +'J' + \\5
   want: J5
-- code: -'12' + \\3 + 4
+- code: +'12' + \\3 + 4
   want: "1234"
 - code: \{:a :b} + \{:b :c :d}
   want:: \{:a :b :c :d}
 - name: add+ with hash-maps and array-maps
-  code: -{:a 1} + {:b 2} + {:c 1 :d 1 :e 1 :f 1 :g 1 :h 1 :i 1 :j 1 :k 1 :l 1}
-  want:: -{:a 1 :b 2 :c 1 :d 1 :e 1 :f 1 :g 1 :h 1 :i 1 :j 1 :k 1 :l 1}
+  code: +{:a 1} + {:b 2} + {:c 1 :d 1 :e 1 :f 1 :g 1 :h 1 :i 1 :j 1 :k 1 :l 1}
+  want:: +{:a 1 :b 2 :c 1 :d 1 :e 1 :f 1 :g 1 :h 1 :i 1 :j 1 :k 1 :l 1}
 
 - note: 'sub+ tests'
 
@@ -80,7 +80,7 @@ test::
 - code: \\A - []
   what: error
   want: "Can't sub(\\A [])"
-- code: -'foobarbazbar' - 'bar'
+- code: +'foobarbazbar' - 'bar'
   want: foobaz
 - code: nil - 2
   what: error
@@ -104,7 +104,7 @@ test::
 - code: nil.++
   what: error
   want: "Can't convert a nil value to a number"
-- code: -"B".++
+- code: +"B".++
   what: error
   want: 'Can''t inc+("B")'