Merge branch 'fix-macros'

Author: CuppoJava

compiler/core-macros.stanza

@@ -1297,12 +1297,17 @@ defsyntax core :
 
    ;Represents the entire defn header.
    defproduction defnheader:DefnHeader
-   defrule defnheader = ((?args:#fnargbinding! ...) ?a2:#return-type?) :
+   defrule defnheader = ((#do? ?args:#fnargbinding! ...) ?a2:#return-type?) :
      DefnHeader(closest-info(), to-tuple(args), a2)
 
+   ;Represents an optional @do so that users can optionally
+   ;omit the space.
+   defproduction do?: False
+   defrule do? = (@do) : false
+   defrule do? = () : false
+
    ;Error production
    defproduction defnheader!:DefnHeader
-   fail-if defnheader! = ((@do _ ...)) : CSE(closest-info(), BAD-ARGLIST-MSG)
    defrule defnheader! = (?x:#defnheader)
    fail-if defnheader! = () : CSE(closest-info(), "Invalid syntax for function arguments.")
 
@@ -1332,12 +1337,11 @@ defsyntax core :
 
    ;Represents the entire defn header.
    defproduction lsdefnheader:DefnHeader
-   defrule lsdefnheader = ((?args:#lsfnargbinding! ...) #->! ?a2:#ls-type!) :
+   defrule lsdefnheader = ((#do? ?args:#lsfnargbinding! ...) #->! ?a2:#ls-type!) :
      DefnHeader(closest-info(), to-tuple(args), One(a2))
 
    ;Error production
    defproduction lsdefnheader!:DefnHeader
-   fail-if lsdefnheader! = ((@do _ ...)) : CSE(closest-info(), BAD-ARGLIST-MSG)
    defrule lsdefnheader! = (?x:#lsdefnheader)
    fail-if lsdefnheader! = () : CSE(closest-info(), "Invalid syntax for function arguments.")
 
@@ -1363,13 +1367,11 @@ defsyntax core :
    defrule arglist = ((?xs:#argbinding ...)) : [map(key, xs), map(value, xs)]
 
    defproduction fnheader! : [List List ?]
-   fail-if fnheader! = ((@do _ ...)) : 
-      CSE(closest-info(), BAD-ARGLIST-MSG)
-   defrule fnheader! = (?args:#arglist -> ?a2:#type!) :
-      val [xs, a1] = args
+   defrule fnheader! = ((#do? ?args:#argbinding ...) -> ?a2:#type!) :
+      val [xs, a1] = [map(key, args), map(value, args)]
       [xs, a1, a2]
-   defrule fnheader! = (?args:#arglist) :
-      val [xs, a1] = args
+   defrule fnheader! = ((#do? ?args:#argbinding ...)) :
+      val [xs, a1] = [map(key, args), map(value, args)]
       [xs, a1, `($none)]
    fail-if fnheader! = () :
       CSE(closest-info(), "Expected argument list here.")
@@ -1759,10 +1761,12 @@ defsyntax core :
    defproduction in-bindings! : List<KeyValue>
    defrule in-bindings! = ((?b0:#in-binding ?bn:#in-binding! ...)) : cons(b0, bn)
    defrule in-bindings! = (?b:#in-binding!) : List(b)
+
+   defproduction operator-exp!
+   defrule operator-exp! = (:) : `core/do
+   defrule operator-exp! = (?f:#exp! #:!) : f
 
-   fail-if exp4 = (for #in-binding :) :
-      CSE(closest-info(), BAD-FOR-MSG)         
-   defrule exp4 = (for ?bs:#in-bindings! ?f:#exp! #:! ?body:#exp!) :
+   defrule exp4 = (for ?bs:#in-bindings! ?f:#operator-exp! ?body:#exp!) :
       val template = `(f(fn xs : body, ys))
       parse-syntax[core / #exp](
          fill-template(template, [
@@ -2936,6 +2940,4 @@ defsyntax core :
 
 
 ;============== Error Messages ============================
-val BAD-ARGLIST-MSG = "Incorrect syntax for argument list. Did you forget to put a space between the function name and the argument list?"
 val BAD-MATCH-MSG = "Incorrect syntax for match expression. Is there an extra space between match and the argument list?"
-val BAD-FOR-MSG = "Missing operating function in for expression. Did you forget to put a do after the bindings?"

compiler/il-ir.stanza

@@ -70,9 +70,6 @@ with:
          IVisibility :
             exp: IExp
             visibility: Visibility
-         ILoadPackage :
-            filename: String
-            pkg: ? ;TGPackage|KPackage
 
          ;=== Doc Form ===
          IDoc :
@@ -407,8 +404,6 @@ with:
                (v:Public) : "$public"
                (v:Protected) : "$protected"
                (v:Private) : "$private"}
-      ILoadPackage :
-         ($loadpackage filename pkg)
 
       IDoc :
          ($doc string)
@@ -602,7 +597,6 @@ with:
 public defn name! (e:IExp) -> Symbol :
    match(e) :
       (e:IVar|LetPackage) : name(e)
-      (e:ILoadPackage) : name(pkg(e))
       (e:IDefType) : name!(class(e))
       (e:IDefPackage|IDefChild|IDef|IDefVar|IDefn|IDefmulti|
          ISet|ICap|ILSField|ILSTagof|ILSLabeledBlock|

compiler/input.stanza

@@ -522,7 +522,6 @@ defn to-iimport (e:IImportExp) -> IImport :
          IDefPackage:
             {name:v imports:(imp ...)}
             custom{ensure-unique-imports(e)}
-         ILoadPackage: ()
          IBegin: {exps:(pe ...)}
          + te