Merge branch 'master' into al/more-gc-stats

Author: alijitx

ci/bootstrap-stanza.sh

@@ -54,4 +54,4 @@ ${STANZA} compile-macros \
   compiler/reader-lang.stanza \
   -o bootstrap.macros 
 
-${STANZA} core/stanza.proj compiler/stanza.proj stz/driver -o stanzatemp -macros bootstrap.macros -flags BOOTSTRAP
+${STANZA} core/stanza.proj compiler/stanza.proj stz/driver -o stanzatemp -macros bootstrap.macros -flags BOOTSTRAP -build-from-source

ci/build-stanza-version.txt

@@ -7,4 +7,4 @@
 #   like 1.23.45
 #
 # Use version 0.17.56 to compile 0.18.0
-0.18.45
+0.18.62

compiler/config.stanza

@@ -264,7 +264,7 @@ defn verify-installation () :
       catch (e:Exception) :
         ;Could not retrieve version of the executable.
         val msg = "Stanza install directory is set to %_, \
-                   but the version of the Stanza executable could not verified. %_"
+                   but the version of the Stanza executable could not be verified. %_"
         throw $ Exception(msg % [STANZA-INSTALL-DIR, e])
 
     ;Check that the version string is well-formatted.

compiler/core-macros.stanza

@@ -1061,6 +1061,7 @@ defsyntax core :
    public defproduction id$
    public defproduction ids!
    defrule id! = (?x:#id)
+   fail-if id! = (?x:#symbol) : CSE(closest-info(), "Cannot use reserved keyword '%_' as an identifier." % [x])
    fail-if id! = () : CSE(closest-info(), "Identifier expected here.")
    defrule id$ = (?x:#id! (! _))
    fail-if id$ = () : CSE(closest-info(), "Expected an identifier here.")
@@ -1297,12 +1298,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 +1338,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 +1368,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 +1762,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 +2941,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/dl-ir.stanza

@@ -6,6 +6,7 @@ defpackage stz/dl-ir :
   import stz/type-fargs
   import stz/absolute-info
   import stz/base-dir
+  import stz/printing-utils
 
 ;============================================================
 ;======================== PackageIO =========================
@@ -31,16 +32,29 @@ defmethod hash (p : ImportedPackage) :
 defmethod equal? (p1 : ImportedPackage, p2 : ImportedPackage) :
   equal?(package-name(p1), package-name(p2))
 
+;- forwarded-imports: If package A imports B, and B forwards C,
+;  then we say that C is imported into A via forwarding (assuming
+;  that C is not already directly imported into A).
+;  This field stores all packages that are imported via forwarding.
+;- direct-imports: These are the packages that are explicitly imported
+;  by the user via an import statement. This is a subset of the
+;  'imported-packages' field in that it does not include the packages
+;  that are implicitly imported due to type signatures.
 public defstruct PackageIO :
   package: Symbol
   imported-packages: Tuple<ImportedPackage> with: (updater => sub-imported-packages)
+  forwarded-imports: Tuple<Symbol>
+  direct-imports: Tuple<Symbol>
   imports: Tuple<Import> with: (updater => sub-imports)
   exports: Tuple<Export> with: (updater => sub-exports)
   documentation?:False|String with: (updater => sub-documentation)
 
+;Subset of PackageIO which does not include 'Import' field.
 public defstruct PackageExports :
   package: Symbol
   imported-packages: Tuple<ImportedPackage>
+  forwarded-imports: Tuple<Symbol>
+  direct-imports: Tuple<Symbol>
   exports: Tuple<Export> with: (updater => sub-exports)
 
 ;============================================================
@@ -442,7 +456,7 @@ public defn match? (x:Rec, y:Rec, types-in-io:HashSet<TypeId>|False) -> True|Fal
 ;============================================================
 
 public defn to-package-exports (io:PackageIO) :
-  PackageExports(package(io), imported-packages(io), exports(io))
+  PackageExports(package(io), imported-packages(io), forwarded-imports(io), direct-imports(io), exports(io))
 
 public defn to-package-exports? (io:PackageIO|False) :
   match(io:PackageIO) :
@@ -567,10 +581,26 @@ defmethod print (o:OutputStream, x:Export) :
     lnprint(o2, "doc: %_" % [documentation?(x)])
 
 defmethod print (o:OutputStream, x:PackageIO) :
-  print(o, "package %~ :" % [package(x)])
-  val o2 = IndentedStream(o)
-  lnprint(o2, "imported-packages = (%@)" % [imported-packages(x)])
-  lnprints(o2, cat(imports(x), exports(x)))
+  val items = [
+    falseable-field("documentation", documentation?(x))
+    named-list-fields("imported-packages", imported-packages(x))
+    line-wrapped-field("forwarded-imports", forwarded-imports(x))
+    line-wrapped-field("direct-imports", direct-imports(x))
+    inline-fields(imports(x))
+    inline-fields(exports(x))]
+  print(o, "package %~ %_" % [package(x), colon-field-list(items)])
+
+defmethod print (o:OutputStream, x:ImportedPackage) :
+  val items = [
+    simple-field("forward", forward(x))
+    falseable-field("only", only(x))
+    inline-fields(prefix(x))]
+  print(o, "import package %~ %_" % [package-name(x), colon-field-list(items)])
+
+defmethod print (o:OutputStream, x:ImportPrefix) :
+  match(names(x)) :
+    (names:Tuple<Symbol>) : print(o, "prefix(%,) => %~" % [names, prefix(x)])
+    (f:False) : print(o, "prefix => %~" % [prefix(x)])
 
 defmethod print (o:OutputStream, x:PackageExports) :
   print(o, "package %~ :" % [package(x)])
@@ -603,7 +633,8 @@ defsyntax dl-ir :
                          ?imports:#import ...
                          ?exports:#export ...) :
     ;[TODO] Add doc string reader macro. Defaulted to false for now.
-    PackageIO(name, to-tuple(map({ImportedPackage(_)}, ips)), to-tuple(imports), to-tuple(exports), false)
+    ;[TODO]: is the empty direct-import list OK?
+    PackageIO(name, to-tuple(map({ImportedPackage(_)}, ips)), [], [], to-tuple(imports), to-tuple(exports), false)
 
   defproduction dtype : DType
   defrule dtype = (byte) : DByte()

compiler/el-ir.stanza

@@ -1065,7 +1065,7 @@ defsyntax el-ir :
   defrule epackage = (package ?name:#symbol : (?ss:#tstmt ... #E)) :
     val ins = to-tuple(filter-by<Import>(ss))
     val exs = to-tuple(filter-by<Export>(ss))
-    val io = PackageIO(name, [], ins, exs, false)
+    val io = PackageIO(name, [], [], [], ins, exs, false)
     val es = to-tuple(filter-by<ETExp>(ss))
     EPackage(io, to-tuple(es))
 

compiler/el.stanza

@@ -262,7 +262,7 @@ defn collapse (epackages:Tuple<EPackage>) -> EPackage :
         for ex in exports(packageio(e)) seq :
           val n* = global-rec-ids[id(rec(ex))]
           sub-n(ex, n*)
-    PackageIO(`prog, [], [], exports*, false)
+    PackageIO(`prog, [], [], [], [], exports*, false)
 
   ;Rename one specific package
   defn renamed-exps (epackage:EPackage) :

compiler/front-end.stanza

@@ -540,11 +540,12 @@ defn FrontEnd (sys:FrontEndInputs) -> FrontEnd :
     val resolved = resolve-packages(package-names, errorlist)
     val new-inputs = HashTable<Symbol,PackageInFile>()
     for e in errorlist do :
-      match(e:MissingType) :
+      match(e:MissingType|MissingForwardedPackage) :
         match(source-file?(src-package(e))) :
           (file:String) : new-inputs[src-package(e)] = PackageInFile(src-package(e), file)
           (file:False) : throw(FrontEndErrors(errorlist))
-      else : throw(FrontEndErrors(errorlist))
+      else :
+        throw(FrontEndErrors(errorlist))
     [resolved, to-tuple(values(new-inputs))]
 
   defn resolve-packages! (package-names:Tuple<Symbol>) -> ResolverResult :

compiler/il-ir.stanza

@@ -10,10 +10,17 @@ defpackage stz/il-ir :
 ;General Multis for IExp
 public defmulti info (e:IExp) -> False|AbsoluteFileInfo
 
+;- imports: Corresponds one-to-one with the user's 'import' statements
+;  nested under 'defpackage'. 
+;- forwarded-imports: If package A imports B, and B forwards C,
+;  then we say that C is imported into A via forwarding (assuming
+;  that C is not already directly imported into A).
+;  This field stores all packages that are imported via forwarding.
 public defstruct IPackage :
   name: Symbol
   documentation?: IDoc|False
   imports: Tuple<IImport> with: (updater => sub-imports)
+  forwarded-imports: Tuple<Symbol> with: (updater => sub-forwarded-imports)
   exps: List<IExp> with: (updater => sub-exps)
   info: AbsoluteFileInfo|False
   namemap: NameMap with: (default => void, updater => sub-namemap)
@@ -63,9 +70,6 @@ with:
          IVisibility :
             exp: IExp
             visibility: Visibility
-         ILoadPackage :
-            filename: String
-            pkg: ? ;TGPackage|KPackage
 
          ;=== Doc Form ===
          IDoc :
@@ -400,8 +404,6 @@ with:
                (v:Public) : "$public"
                (v:Protected) : "$protected"
                (v:Private) : "$private"}
-      ILoadPackage :
-         ($loadpackage filename pkg)
 
       IDoc :
          ($doc string)
@@ -595,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/il-to-tl.stanza

@@ -169,11 +169,12 @@ defn to-imported-package (i:IImport) -> ImportedPackage :
 ;The imported/exported entries will be populated
 ;after type inference.
 defn to-packageio (ipackage:IPackage) -> PackageIO :
+  val direct-imports = to-tuple(seq(package, imports(ipackage)))
   val imports = to-tuple(seq(to-imported-package, imports(ipackage)))
   val doc? = match(documentation?(ipackage)) :
     (d:IDoc) : value(string(d) as ILiteral) as String
     (f:False) : false
-  PackageIO(name(ipackage), imports, [], [], doc?)
+  PackageIO(name(ipackage), imports, forwarded-imports(ipackage), direct-imports, [], [], doc?)
 
 ;============================================================
 ;=============== Conversion Functions =======================

compiler/input.stanza

@@ -468,23 +468,23 @@ defn split-packages (e:IExp,
           val e = all-exps[i + 1] as IDefPackage
           val [exps, end] = package-exps(i + 2)
           val imports = to-tuple $ seq(to-iimport, imports(e) as List<IImportExp>)
-          add(packages, IPackage(name!(e), doc, imports, exps, info(e)))
+          add(packages, IPackage(name!(e), doc, imports, [], exps, info(e)))
           loop(end)
 
         ;Package without preceding IDoc form.
         DefPackageExp:
           val e = all-exps[i] as IDefPackage
           val [exps, end] = package-exps(i + 1)
           val imports = to-tuple $ seq(to-iimport, imports(e) as List<IImportExp>)
-          add(packages, IPackage(name!(e), false, imports, exps, info(e)))
+          add(packages, IPackage(name!(e), false, imports, [], exps, info(e)))
           loop(end)
 
         ;Default package.
         WithinPackageExp:
           val [exps, end] = package-exps(i)
           val info = info(head(exps)) when not empty?(exps)
           val name = gensym(`default)
-          add(packages, IPackage(name, false, default-imports, exps, info))
+          add(packages, IPackage(name, false, default-imports, [], exps, info))
           loop(end)
 
   ;Return packages
@@ -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
 

compiler/main.stanza

@@ -1210,7 +1210,6 @@ add-stanza-command(defs-db-command())
 ;============================================================
 
 public defn stanza-main (commands:Collection<Command>, default-command:String|False) :
-  initialize-process-launcher()
   set-max-heap-size(STANZA-MAX-COMPILER-HEAP-SIZE)
   simple-command-line-cli(version-message(), to-tuple(commands), default-command, true)
 

compiler/params.stanza

@@ -18,7 +18,7 @@ public defn compiler-flags () :
   to-tuple(COMPILE-FLAGS)
 
 ;========= Stanza Configuration ========
-public val STANZA-VERSION = [0 18 58] 
+public val STANZA-VERSION = [0 18 67] 
 public var STANZA-INSTALL-DIR:String = ""
 public var OUTPUT-PLATFORM:Symbol = `platform
 public var STANZA-PKG-DIRS:List<String> = List()

compiler/pkg-serializer.stanza

@@ -154,6 +154,8 @@ defserializer PkgSerializer (include-asm?:True|False) :
   deftype packageio (PackageIO) :
     package:symbol
     imported-packages:tuple(importedpackage)
+    forwarded-imports:tuple(symbol)
+    direct-imports:tuple(symbol)
     imports:tuple(dimport)
     exports:tuple(dexport)
     documentation?:opt(string)

compiler/repl.stanza

@@ -797,6 +797,7 @@ defn REPLEnv () :
     IPackage(gensym(`repl),
              false,
              to-tuple(values(exp-imports)),
+             []
              List(wrap-display-result(exp)),
              info(exp))