diff options
| author | azidar | 2015-07-02 12:22:47 -0700 |
|---|---|---|
| committer | azidar | 2015-07-02 12:22:47 -0700 |
| commit | f87399045123c8bc73dabe82ecff6a9a5bdfea41 (patch) | |
| tree | d422340612c1f60ea884fcb536032965d548f064 | |
| parent | c850589cb5d91490b979e34c7dd43a2d4389ca5f (diff) | |
Hopefully fixed stanza so it can correctly compile itself
| -rw-r--r-- | src/lib/stanza.zip | bin | 3739575 -> 3729478 bytes | |||
| -rw-r--r-- | src/main/stanza/firrtl-main.stanza | 5 | ||||
| -rw-r--r-- | src/main/stanza/firrtl-test-main.stanza | 5 | ||||
| -rw-r--r-- | src/main/stanza/ir-parser.stanza | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/stanza.zip b/src/lib/stanza.zip Binary files differindex 9549a65a..5ceb98a8 100644 --- a/src/lib/stanza.zip +++ b/src/lib/stanza.zip diff --git a/src/main/stanza/firrtl-main.stanza b/src/main/stanza/firrtl-main.stanza index efc6a7d0..2ccbc1b6 100644 --- a/src/main/stanza/firrtl-main.stanza +++ b/src/main/stanza/firrtl-main.stanza @@ -1,8 +1,9 @@ #include<"core/stringeater.stanza"> #include<"core/macro-utils.stanza"> #include<"compiler/stz-algorithms.stanza"> -#include<"compiler/stz-lexer.stanza"> #include<"compiler/stz-parser.stanza"> +#include<"compiler/stz-lexer.stanza"> +#include("firrtl-lexer.stanza") #include("firrtl-ir.stanza") #include("ir-utils.stanza") #include("ir-parser.stanza") @@ -15,7 +16,7 @@ defpackage firrtl-main : import verse import firrtl/parser import firrtl/passes - import stz/lexer + import firrtl/lexer import stz/parser import firrtl/ir-utils diff --git a/src/main/stanza/firrtl-test-main.stanza b/src/main/stanza/firrtl-test-main.stanza index 071717bb..beb288b1 100644 --- a/src/main/stanza/firrtl-test-main.stanza +++ b/src/main/stanza/firrtl-test-main.stanza @@ -1,8 +1,9 @@ #include<"core/stringeater.stanza"> #include<"core/macro-utils.stanza"> #include<"compiler/stz-algorithms.stanza"> -#include<"compiler/stz-lexer.stanza"> #include<"compiler/stz-parser.stanza"> +#include<"compiler/stz-lexer.stanza"> +#include("firrtl-lexer.stanza") #include("firrtl-ir.stanza") #include("ir-utils.stanza") #include("ir-parser.stanza") @@ -22,7 +23,7 @@ defpackage firrtl-main : import verse import firrtl/parser import firrtl/passes - import stz/lexer + import firrtl/lexer import stz/parser import firrtl/ir-utils import firrtl/compiler diff --git a/src/main/stanza/ir-parser.stanza b/src/main/stanza/ir-parser.stanza index 588efeac..b511f640 100644 --- a/src/main/stanza/ir-parser.stanza +++ b/src/main/stanza/ir-parser.stanza @@ -3,7 +3,7 @@ defpackage firrtl/parser : import verse import firrtl/ir2 import stz/parser - import stz/lexer + import firrtl/lexer ;======= Convenience Functions ======== defn first-info? (form) -> FileInfo|False : |