improve function hush syntax to what I always think it is

gkz · Jul 12, 2013 · 79e5d77 · 79e5d77 · vendethiel · Jul 12, 2013
1 parent d19f1e8
commit 79e5d77
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 9 deletions.
diff --git a/lib/ast.js b/lib/ast.js
diff --git a/lib/grammar.js b/lib/grammar.js
diff --git a/lib/lexer.js b/lib/lexer.js
diff --git a/lib/parser.js b/lib/parser.js
diff --git a/src/ast.ls b/src/ast.ls
@@ -1591,7 +1591,7 @@ class exports.Existence extends Node implements Negatable
 #### Fun
 # A function definition. This is the only node that creates a `new Scope`.
 class exports.Fun extends Node
-  (@params or [], @body or Block!, @bound and \this$, @curried or false) ~>
+  (@params or [], @body or Block!, @bound and \this$, @curried or false, @hushed = false) ~>
 
   children: <[ params body ]>
 

diff --git a/src/grammar.ls b/src/grammar.ls
@@ -243,7 +243,7 @@ bnf =
 
     # The function literal can be either anonymous with `->`,
     o 'PARAM( ArgList OptComma )PARAM -> Block'
-    , -> L Fun $2, $6, $5.charAt(0) is \~, $5.length is 3
+    , -> L Fun $2, $6, /~/.test($5), /--|~~/.test($5), /!/.test($5)
     # or named with `function`.
     o 'FUNCTION CALL( ArgList OptComma )CALL Block' -> L Fun($3, $6)named $1
 

diff --git a/src/lexer.ls b/src/lexer.ls
@@ -566,7 +566,7 @@ exports import
     case \~
       return 1 if @dotcat val
       tag = \UNARY
-    case \-> \~> \--> \~~> then up = \->; fallthrough
+    case \-> \~> \--> \~~> \!-> \!~> \!--> \!~~> then up = \->; fallthrough
     case \<- \<~ \<-- \<~~ then @parameters tag = up || \<-
     case \::
       @adi!
@@ -1206,12 +1206,12 @@ SYMBOL = //
 | \.(?:[&\|\^] | << | >>>?)\.=? # bitwise and shifts
 | \.{1,3}                       # dot / cascade / splat/placeholder/yada*3
 | \^\^                          # clone
-| --> | ~~> | <-- | <~~         # curry
+| !?--> | !?~~> | <-- | <~~     # curry
 | ([-+&|:])\1                   # crement / logic / `prototype`
 | %%                            # mod
 | &                             # arguments
 | \([^\n\S]*\)                  # call
-| [-~]>                         # function, bound function
+| !?[-~]>                       # function, bound function
 | <[-~]                         # backcall
 | [!=]==?                       # strict equality, deep equals
 | !?\~=                         # fuzzy equality

diff --git a/test/function.ls b/test/function.ls
@@ -524,6 +524,11 @@ eq void do
 
 eq false !!->
 
+eq void do (x) !-> true
+eq void do (x) !--> true
+eq void do (x) !~> true
+eq void do (x) !~~> true
+
 ### auto currying magic
 times = (x, y) --> x * y
 timesTwo = times 2