Changeset 3402 for src/pge

Timestamp:

05/18/05 20:35:47 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

4977

Message:

* Fix a bug in run_pge in external single-process parrot mode:

Previously, rules cannot contain newlines due to line buffering.
putter++ for catching this.

Files:

• src/pge/run_pge.pir (modified) (3 diffs)

src/pge/run_pge.pir

@@ -41 +41 @@
     chopn arg2, 1 # skip \n
 
+    arg1 = unescape(arg1)
+    arg2 = unescape(arg2)
+
     if cmd == "add_rule" goto do_add_rule
     if cmd == "match" goto do_match
@@ -62 +65 @@
     arg1 = args[1]
     arg2 = args[2]
+    arg1 = unescape(arg1)
+    arg2 = unescape(arg2)
     result = match(arg1, arg2)
     print result
@@ -67 +72 @@
   end:
 .end
+
+.sub unescape
+    .param string str
+    .local string ret, tmp
+    .local int i, j
+
+    ret = ""
+    j = length str
+    if j == 0 goto END
+    i = 0
+
+LOOP:
+    tmp = str[i]
+    inc i
+    if i >= j goto FIN
+
+    eq tmp, "\\", ESC
+    concat ret, tmp
+    goto LOOP
+
+ESC:
+    tmp = str[i]
+    inc i
+    eq tmp, "n", LF
+    concat ret, tmp
+    goto UNESC
+LF:
+    concat ret, "\n"
+UNESC:
+    inc i
+    if i >= j goto END
+    goto LOOP
+
+FIN:
+    concat ret, tmp
+END:
+    .return(ret)
+.end