move functions of old export statement to global statement, make export statement work with Lua module system.

5 files changed, 127 insertions, 67 deletions

diff --git a/spec/inputs/class.moon b/spec/inputs/class.moon
index 3288dc6..533694e 100644
--- a/spec/inputs/class.moon
+++ b/spec/inputs/class.moon
@@ -158,7 +158,7 @@ print (class WhatsUp).__name
 
 --
 
-export ^
+global ^
 class Something
         _ = nil
 
diff --git a/spec/inputs/export.moon b/spec/inputs/export.moon
index a8c782c..9c906d5 100644
--- a/spec/inputs/export.moon
+++ b/spec/inputs/export.moon
@@ -1,77 +1,45 @@
 
-do
-        export a,b,c = 223, 343
-        export cool = "dad"
+export a,b,c = 223, 343, 123
+export cool = "dad"
 
-do
-        export class Something
-                umm: "cool"
+d,e,f = 3, 2, 1
+export d, e, f
 
-do
-        export a,b,c
-        a,b,c,d = "hello"
+export class Something
+        umm: "cool"
 
+export if this
+        232
+else
+        4343
 
-do
-        What = if this
-                232
-        else
-                4343
+export What = if this
+        232
+else
+        4343
 
-        export ^
+export y = ->
+        hallo = 3434
 
-        another = 3434
-        Another = 7890
+export with tmp
+        j = 2000
 
-        if inner then Yeah = "10000"
-
-        What = if this
-                232
-        else
-                4343
-
-
-do
-        export *
-
-        What = if this
-                232
-        else
-                4343
-
-        x,y,z = 1,2,3
-
-        y = ->
-                hallo = 3434
-
-        with tmp
-                j = 2000
-
-
-do
-        export *
-        x = 3434
-        if y then
-                x = 10
-
-do
-        export *
-        if y then
-                x = 10
-        x = 3434
-
-do
-        do
-                export *
-
-                k = 1212
+export cbVal = do
+        h = 100
+        (x)<- f
+        return x h
 
-                do
-                        h = 100
+export y = ->
+        h = 100
+        k = 100
 
-                y = ->
-                        h = 100
-                        k = 100
+export switch h
+        when 100, 150 then 200
+        when 200 then 300
+        else 0
 
-        h = 100
+export Constant = switch value
+        when "good" then 1
+        when "better" then 2
+        when "best" then 3
 
diff --git a/spec/inputs/export_default.moon b/spec/inputs/export_default.moon
new file mode 100644
index 0000000..73f43ac
--- /dev/null
+++ b/spec/inputs/export_default.moon
@@ -0,0 +1,15 @@
+
+print "OK"
+
+export default ->
+        print "hello"
+        123
+
+(x, fy)<- f 123, "abc" unless isOff
+print x
+(y, res)<- fy
+return if res
+        abc + y
+else
+        abc
+
diff --git a/spec/inputs/global.moon b/spec/inputs/global.moon
new file mode 100644
index 0000000..7d6cfde
--- /dev/null
+++ b/spec/inputs/global.moon
@@ -0,0 +1,77 @@
+
+do
+        global a,b,c = 223, 343
+        global cool = "dad"
+
+do
+        global class Something
+                umm: "cool"
+
+do
+        global a,b,c
+        a,b,c,d = "hello"
+
+
+do
+        What = if this
+                232
+        else
+                4343
+
+        global ^
+
+        another = 3434
+        Another = 7890
+
+        if inner then Yeah = "10000"
+
+        What = if this
+                232
+        else
+                4343
+
+
+do
+        global *
+
+        What = if this
+                232
+        else
+                4343
+
+        x,y,z = 1,2,3
+
+        y = ->
+                hallo = 3434
+
+        with tmp
+                j = 2000
+
+
+do
+        global *
+        x = 3434
+        if y then
+                x = 10
+
+do
+        global *
+        if y then
+                x = 10
+        x = 3434
+
+do
+        do
+                global *
+
+                k = 1212
+
+                do
+                        h = 100
+
+                y = ->
+                        h = 100
+                        k = 100
+
+        h = 100
+
diff --git a/spec/inputs/import.moon b/spec/inputs/import.moon
index ded1ffd..99981f8 100644
--- a/spec/inputs/import.moon
+++ b/spec/inputs/import.moon
@@ -58,7 +58,7 @@ do
         import "lpeg" as {:C, :Ct, :Cmt}
 
 do
-        export *
+        global *
         import 'module'
         import 'module_x'
         import "org.package.module-y"