disable empty hash

Author: egonSchiele

EDGE_CASES.md

@@ -1,13 +1,14 @@
 In designing any language it's interesting to see what conflicts arise based on combinations you hadn't thought of. Here are some.
 
+## Empty Hash
+
     foo := {}
 
 Is this an empty function definition, or is foo returning an empty hash?
-It's ambiguous, here's how I decided to define it.
+These are more clear:
 
-    "foo := {}" `matches` "function foo() {\n}",
-    "foo := return {}" `matches` "function foo() {\n    return [];\n}",
-    "foo := { {} }" `matches` "function foo() {\n    return [];\n}"
+    foo:= return {}
+    foo:= { {} }
 
 Similarly,
 

README.md

@@ -203,14 +203,16 @@ becomes
 
 ```
 $a = [
-foo => 1,
-bar => 2,
-baz => "hi"
+    "foo" => 1,
+    "bar" => 2,
+    "baz" => "hi"
 ]
 ```
 
 Trailing comma is optional.
 
+Note empty hash `{}` is not allowed, you need to make it like this: `[]`. See EDGE_CASES.md for an explanation of why.
+
 ## Dot notation
 
 ```

src/Parser.hs

@@ -95,7 +95,7 @@ saltyParserSingleWithoutNewline = do
   parens
   <||> hashTable
   <||> array
-  <||> emptyHash
+  -- <||> emptyHash
   <||> (braces Nothing)
   <||> function
   <||> functionTypeSignature
@@ -138,7 +138,7 @@ validFuncArgTypes :: SaltyParser
 validFuncArgTypes = debug "validFuncArgTypes" >> do
        hashTable
   <||> array
-  <||> emptyHash
+  -- <||> emptyHash
   <||> operation
   <||> partialOperation
   <||> saltyString
@@ -196,7 +196,7 @@ validHashValue = debug "validHashValue" >> do
   <||> hashLookup
   <||> hashTable
   <||> array
-  <||> emptyHash
+  -- <||> emptyHash
   <||> flagName
   <||> saltyBool
   <||> saltyNull

test.salt

@@ -1,16 +1,3 @@
-$a = 0;
-$b = '0';
-$c = '1';
-$d = '1';
-
-// assert throws a warning if its argument is not true
-
-// These comparisons will always be true, even if the types aren't the same.
-assert($a == $b); // equality
-assert($c != $a); // inequality
-assert($c <> $a); // alternative inequality
-assert($a < $c);
-assert($c > $b);
-assert($a <= $b);
-assert($c >= $d);
-
+{ a: 1,
+  b: 2
+}

test/Spec.hs

@@ -340,15 +340,16 @@ transpileTests = [
     "$foo = 1;\n$bar = 2;" `matches` "$foo = 1;\n$bar = 2;",
 
     -- backticks for php
-    "'foo' ++ `'bar' . 'baz'`" `matches` "\"foo\" . 'bar' . 'baz';",
+    "'foo' ++ `'bar' . 'baz'`" `matches` "\"foo\" . 'bar' . 'baz';"
 
     -- empty hash
-    "{}" `matches` "[];",
-    "foo = {}" `matches` "$foo = [];",
-    "a, b, foo = {}" `matches` "$a = [];\n$b = [];\n$foo = [];",
-    "foo := {}" `matches` "function foo() {\n}",
-    "foo := return {}" `matches` "function foo() {\n    return [];\n}",
-    "foo := { {} }" `matches` "function foo() {\n    return [];\n}"
+    -- disabling this feature since the syntax becomes ambiguous
+    -- "{}" `matches` "[];",
+    -- "foo = {}" `matches` "$foo = [];",
+    -- "a, b, foo = {}" `matches` "$a = [];\n$b = [];\n$foo = [];",
+    -- "foo := {}" `matches` "function foo() {\n}",
+    -- "foo := return {}" `matches` "function foo() {\n    return [];\n}",
+    -- "foo := { {} }" `matches` "function foo() {\n    return [];\n}"
 
     -- unsure what to do with this
     -- "if 1 == 1 then {}" `matches` ""