Changeset 3118 for src/pge

Timestamp:

05/12/05 21:39:48 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

4536

Message:

* sync pge

Location:

src/pge

Files:

• PGE/Exp.pir (modified) (6 diffs)
• PGE/Hs.pir (modified) (3 diffs)
• cclass.pasm (added)

src/pge/PGE/Exp.pir

@@ -29 +29 @@
 
 =cut
+
+.include "cclass.pasm"
 
 .namespace [ "PGE::Exp" ]
@@ -486 +488 @@
     $S0 = self."quant"()
     $S1 = self["literal"]
+    $P0 = find_global "Data::Escape", "String"
+    $S1 = $P0($S1, "'")
     emit(code, "\n  %s:  # literal %s", label, $S0)
     emit(code, "    lit = '%s'", $S1)
@@ -516 +520 @@
     .return self.genliteral(code, label, next)
   named:
-    $S1 = cname
-    emit(code, "\n  %s:  # backref $<%s> %s", label, subp, $S1)
+    $P0 = find_global "Data::Escape", "String"
+    $S1 = $P0(cname)
+    emit(code, "\n  %s:  # backref $<%s> %s", label, $S1, $S0)
     emit(code, "    lit = ''")
     emit(code, "    $P0 = getattribute mob, \"PGE::Match\\x0%:capt\"")
@@ -710 +715 @@
 .namespace [ "PGE::Exp::WS" ]
 
+.sub "analyze" method
+    .param pmc next
+    .param pmc pad
+    .local string nextfc
+    self["firstchars"] = ""
+    nextfc = next["firstchars"]
+    unless nextfc > "" goto end
+    $I1 = length nextfc
+    $I0 = find_cclass .CCLASS_WHITESPACE, nextfc, 0, $I1
+    unless $I0 == $I1 goto end
+    self["iscut"] = 1
+  end:
+.end
+
 .sub "gen" method
     .param pmc code
@@ -720 +739 @@
     emit(code, "    if pos >= lastpos goto %s", next)
     emit(code, "    if pos < 1 goto %s_1", label)
-    emit(code, "    $I0 = is_wordchar target, pos")
+    emit(code, "    $I0 = is_cclass %d, target, pos", .CCLASS_WORD)
     emit(code, "    unless $I0 goto %s_1", label)
     emit(code, "    $I0 = pos - 1")
-    emit(code, "    $I0 = is_wordchar target, $I0")
+    emit(code, "    $I0 = is_cclass %d, target, $I0", .CCLASS_WORD)
     emit(code, "    if $I0 goto fail")
     emit(code, "  %s_1:", label)
-    emit(code, "    if pos >= lastpos goto %s_2", label)
-    emit(code, "    $I0 = is_whitespace target, pos")
-    emit(code, "    unless $I0 goto %s_2", label)
-    emit(code, "    inc rep")
-    emit(code, "    inc pos")
-    emit(code, "    goto %s", label)
+    $I0 = self["iscut"]
+    unless $I0 goto backtrack
+    emit(code, "    pos = find_not_cclass %d, target, pos, lastpos", .CCLASS_WHITESPACE)
+    emit(code, "    goto %s", next)
+    goto end
+  backtrack:
+    emit(code, "    rep = $I0 - pos")
+    emit(code, "    pos = $I0")
     emit(code, "  %s_2:", label)
     emit(code, "    if rep == 0 goto %s", next)
@@ -738 +759 @@
     emit(code, "    dec pos")
     emit(code, "    goto %s_2", label)
+  end:
 .end
 

src/pge/PGE/Hs.pir

@@ -122 +122 @@
     .local int tmpi, cond
     .local string tmps, key
-    .local pmc capt, iter, elm, escape, is_array
+    .local pmc capt, iter, subelm, elm, escape, is_array
 
     out = ""
@@ -192 +192 @@
     if is_array goto dumper_array
     unless ari < arc goto dumper_fail
-    elm = elm[-1]
-    tmps = elm."dump_hs"()
+    subelm = elm[-1]
+    tmps = subelm."dump_hs"()
     out .= tmps
     ret
@@ -210 +210 @@
     out .= ", "
   dumper_array_body:
-    elm = elm[ari]
-    tmps = elm."dump_hs"()
+    subelm = elm[ari]
+    tmps = subelm."dump_hs"()
     out .= tmps
     inc ari