Towards more efficient "include"

3 files changed, 30 insertions, 18 deletions

diff --git a/compiler/elymas.ey b/compiler/elymas.ey
index 8e778b1..fd0a3db 100755
--- a/compiler/elymas.ey
+++ b/compiler/elymas.ey
@@ -9,8 +9,8 @@ sys .argv len not { "Usage: ./elymas <input file.ey>" die } rep
 
 [
   "standard.ey"
-  "elymasTokenize.ey"
   "standardClient.ey"
+  "elymasTokenize.ey"
   0 sys .argv *
 ] {
   sys .file -0010 .open
diff --git a/compiler/elymasTokenize.ey b/compiler/elymasTokenize.ey
index 347a81b..a44bcbe 100644
--- a/compiler/elymasTokenize.ey
+++ b/compiler/elymasTokenize.ey
@@ -10,7 +10,7 @@
     }
   > -- /base10decode deff
 
-  { /f deff -101 /s defv regex { f } { s } ? * } /rxparse deff
+  { /f deff /re deff _ /s defv re { f } { s } ? * } /rxparse deff
 
   { ==TOKID ==TOKSTR ==TOKINT
     " " cat
@@ -18,25 +18,25 @@
     [ -01 { _ "" streq not } {
       0 /matched defv { /f deff matched { -- } { { 1 =matched f } rxparse } ? * } /parse deff
 
-      "^ (.*)" { } parse
-      "^#" { "" } parse
-      "^(\\d+) +(.*)" { TOKINT token -01 } parse
-      "^\"(.*)" {
+      { "^ (.*)" regex } { } parse
+      { "^#" regex } { "" } parse
+      { "^(\\d+) +(.*)" regex } { TOKINT token -01 } parse
+      { "^\"(.*)" regex } {
         "" /str defv
         { _ "^\"(.*)" regex { -01 -- 0 } { 1 } ? * } {
           0 /strmatched defv { /f deff strmatched { -- } { { 1 =strmatched f } rxparse } ? * } /strparse deff
 
-          "^\\\\\\\\(.*)" { str "\\" cat =str } strparse
-          "^\\\\n(.*)" { str "\n" cat =str } strparse
-          "^\\\\0(.*)" { str "\0" cat =str } strparse
-          "^\\\\\"(.*)" { str "\"" cat =str } strparse
-          "^([^\"\\\\])(.*)" { str -01 cat =str } strparse
+          { "^\\\\\\\\(.*)" regex } { str "\\" cat =str } strparse
+          { "^\\\\n(.*)" regex } { str "\n" cat =str } strparse
+          { "^\\\\0(.*)" regex } { str "\0" cat =str } strparse
+          { "^\\\\\"(.*)" regex } { str "\"" cat =str } strparse
+          { "^([^\"\\\\])(.*)" regex } { str -01 cat =str } strparse
           strmatched not { "Tokenization of string-like failed" die } rep
         } loop
         str TOKSTR token -01
       } parse
-      "^([^a-zA-Z0-9 ]+)([a-zA-Z0-9][^ ]*) +(.*)" { -201 TOKSTR token " " -1203 cat cat } parse
-      "^([a-zA-Z0-9]+|[^a-zA-Z0-9 ]+) +(.*)" { TOKID token -01 } parse
+      { "^([^a-zA-Z0-9 ]+)([a-zA-Z0-9][^ ]*) +(.*)" regex } { -201 TOKSTR token " " -1203 cat cat } parse
+      { "^([a-zA-Z0-9]+|[^a-zA-Z0-9 ]+) +(.*)" regex } { TOKID token -01 } parse
 
       matched not { "Tokenization failed: " -01 cat die } rep
     } loop -- ]
diff --git a/compiler/standardClient.ey b/compiler/standardClient.ey
index 15c1878..4c03c8e 100644
--- a/compiler/standardClient.ey
+++ b/compiler/standardClient.ey
@@ -431,7 +431,7 @@
   { 0 dumpIndented }
 > -- /dump deff
 
-# # regex support
+## regex support
 # ideas taken from http://swtch.com/~rsc/regexp/regexp3.html
 {
   0 ==MATCH 1 ==TERM 2 ==JUMP 3 ==SPLIT 4 ==SAVE 5 ==FIRST 6 ==LAST
@@ -666,9 +666,14 @@
 
   { ==thread ==newpc <
     newpc ==pc
-    [ thread .captures 20 dearray ] ==captures
+    thread .captures ==captures
   > } /cloneThread deff
 
+  { ==thread ==newpc <
+    newpc ==pc
+    [ thread .captures 20 dearray ] ==captures
+  > } /fullCloneThread deff
+
   { ==prog ==string
     0 ==position
     string len ==maxPosition
@@ -700,8 +705,9 @@
             pc 1 code add thread cloneThread clist .add
             pc 2 code add thread cloneThread clist .add
           } { # SAVE
-            position 1 code thread .captures =[]
-            pc 1 add thread cloneThread clist .add
+            pc 1 add thread fullCloneThread ==newThread
+            position 1 code newThread .captures =[]
+            newThread clist .add
           } { # FIRST
             position 0 eq { pc 1 add thread cloneThread clist .add } rep
           } { # LAST
@@ -738,7 +744,13 @@
   { prog execute }
 } /enregex deff
 
-{ enregex * } /regex deff
+{
+  quoted {
+    _ sys .typed .type 1 eq {
+      enregex
+    } { |enregex "*" | } ? *
+  } { enregex * } ? *
+} /regex defq
 
 { ==filename # ==f (left on the stack and executed from sys .asm .programStart)
   sys .asm .patchProgramStart ==frozenAllocationCount