Author: pmichaud
Date: Fri Mar 17 08:29:30 2006
New Revision: 11916

Modified:
   trunk/compilers/pge/PGE/Exp.pir
   trunk/compilers/pge/PGE/Match.pir
   trunk/compilers/pge/PGE/OPTable.pir
   trunk/compilers/pge/PGE/P5Regexp.pir
   trunk/compilers/pge/PGE/P6Rule.pir
   trunk/compilers/pge/PGE/Rule.pir
   trunk/compilers/pge/PGE/TokenHash.pir
   trunk/runtime/parrot/library/PGE/Dumper.pir
   trunk/runtime/parrot/library/PGE/Hs.pir

Log:
Converted PGE's internal object attributes to use updated sigils and
secondary sigils (from S12).


Modified: trunk/compilers/pge/PGE/Exp.pir
==============================================================================
--- trunk/compilers/pge/PGE/Exp.pir     (original)
+++ trunk/compilers/pge/PGE/Exp.pir     Fri Mar 17 08:29:30 2006
@@ -30,7 +30,7 @@
     $P1 = subclass $P0, "PGE::Exp::Closure"
     $P1 = subclass $P0, "PGE::Exp::Commit"
     $P0 = new .Integer
-    store_global "PGE::Exp", "$_serno", $P0
+    store_global "PGE::Exp", "$!serno", $P0
 .end
 
 
@@ -59,7 +59,7 @@
     if has_prefix goto serno_1
     prefix = "R"
   serno_1:
-    $P0 = find_global "PGE::Exp", "$_serno"
+    $P0 = find_global "PGE::Exp", "$!serno"
     inc $P0
     unless has_start goto serno_2
     $P0 = start
@@ -374,7 +374,7 @@
     emit(code, "    newfrom = find_global \"PGE::Match\", \"newfrom\"")
     emit(code, "    (mob, target, mfrom, mpos) = newfrom(mob, -1)")
     emit(code, "    $P0 = interpinfo %s", .INTERPINFO_CURRENT_SUB)
-    emit(code, "    setattribute mob, \"PGE::Match\\x0&:corou\", $P0")
+    emit(code, "    setattribute mob, \"PGE::Match\\x0&!corou\", $P0")
     emit(code, "    lastpos = length target")
     emit(code, "    ustack = new .ResizablePMCArray")
     emit(code, "    gpad = new .ResizablePMCArray")
@@ -408,7 +408,7 @@
     emit(code, "  fail_cut:")
     emit(code, "    mpos = cutting")
     emit(code, "    null $P0")
-    emit(code, "    setattribute mob, \"PGE::Match\\x0&:corou\", $P0")
+    emit(code, "    setattribute mob, \"PGE::Match\\x0&!corou\", $P0")
     emit(code, "    .yield (mob)")
     emit(code, "    goto fail_forever")
     emit(code, "  succeed:")
@@ -1012,7 +1012,7 @@
     emit(code, "    push ustack, captscope")
     emit(code, "    $P0 = pop gpad")
     emit(code, "    captscope = pop gpad")
-    emit(code, "    $P1 = getattribute $P0, \"PGE::Match\\x0$:pos\"")
+    emit(code, "    $P1 = getattribute $P0, \"PGE::Match\\x0$.pos\"")
     emit(code, "    $P1 = pos")
     self.emitsub(code, next, "$P0", "captscope", "NOCUT")
     emit(code, "    push gpad, captscope")
@@ -1078,7 +1078,7 @@
     emit(code, "    $P0 = find_global \"%s\", \"%s\"", $S0, $S1)
     goto subrule_3
   subrule_simple_name:
-    emit(code, "    $P0 = getattribute captscope, \"PGE::Match\\x0$:pos\"")
+    emit(code, "    $P0 = getattribute captscope, \"PGE::Match\\x0$.pos\"")
     emit(code, "    $P0 = pos")
     emit(code, "    $I0 = can mob, \"%s\"", subname)
     emit(code, "    if $I0 == 0 goto %s_s1", label)
@@ -1098,12 +1098,12 @@
     emit(code, "    setprop $P0, \"nextchars\", $P2")
   subrule_3a:
     emit(code, "    $P0 = $P0($P1%s)", subargs)
-    emit(code, "    $P1 = getattribute $P0, \"PGE::Match\\x0$:pos\"")
+    emit(code, "    $P1 = getattribute $P0, \"PGE::Match\\x0$.pos\"")
     emit(code, "    if $P1 <= %s goto %s_commit", PGE_CUT_MATCH, label)
     if isnegated == 0 goto subrule_4
     emit(code, "    if $P1 >= 0 goto fail")
     emit(code, "    $P1 = pos")
-    emit(code, "    $P1 = getattribute $P0, \"PGE::Match\\x0$:from\"")
+    emit(code, "    $P1 = getattribute $P0, \"PGE::Match\\x0$.from\"")
     emit(code, "    $P1 = pos")
     emit(code, "    goto %s", next)
     goto subrule_commit
@@ -1121,11 +1121,11 @@
     emit(code, "    goto %s", next)
     goto subrule_commit
   subrule_6:
-    emit(code, "    $P1 = getattribute $P0, \"PGE::Match\\x0&:corou\"")
+    emit(code, "    $P1 = getattribute $P0, \"PGE::Match\\x0&!corou\"")
     emit(code, "    if_null $P1, %s", next)
     self.emitsub(code, next, "$P0", "NOCUT")
     emit(code, "    $P0.next()")
-    emit(code, "    $P1 = getattribute $P0, \"PGE::Match\\x0$:pos\"")
+    emit(code, "    $P1 = getattribute $P0, \"PGE::Match\\x0$.pos\"")
     emit(code, "    if $P1 >= 0 goto %s_s3", label)
     emit(code, "    if $P1 > %s goto fail", PGE_CUT_MATCH)
   subrule_commit:
@@ -1183,7 +1183,7 @@
     emit(code, "    $S0 = concat %s, \":\"", lang)
     emit(code, "    $S1 = %s", value)
     emit(code, "    $S0 .= $S1")
-    emit(code, "    $P0 = find_global \"PGE::Rule\", \"%:cache\"")
+    emit(code, "    $P0 = find_global \"PGE::Rule\", \"%!cache\"")
     emit(code, "    $I0 = exists $P0[$S0]")
     emit(code, "    if $I0 goto %s_1", label)
     emit(code, "    $P1 = compreg %s", lang)

Modified: trunk/compilers/pge/PGE/Match.pir
==============================================================================
--- trunk/compilers/pge/PGE/Match.pir   (original)
+++ trunk/compilers/pge/PGE/Match.pir   Fri Mar 17 08:29:30 2006
@@ -14,11 +14,11 @@
     .local pmc base
     $P0 = getclass "Hash"
     base = subclass $P0, "PGE::Match"
-    addattribute base, "$:target"                  # target
-    addattribute base, "$:from"                    # start of match
-    addattribute base, "$:pos"                     # current match position
-    addattribute base, "&:corou"                   # match's corou
-    addattribute base, "@:capt"                    # subpattern captures
+    addattribute base, "$.target"                  # target
+    addattribute base, "$.from"                    # start of match
+    addattribute base, "$.pos"                     # current match position
+    addattribute base, "&!corou"                   # match's corou
+    addattribute base, "@!capt"                    # subpattern captures
     .return ()
 .end
 
@@ -33,7 +33,7 @@
 otherwise if C<isa mob, "PGE::Match"> then the new object is the
 same class as C<mob>, otherwise the new object is a "PGE::Match"
 object.  The optional C<from> parameter says how to initialize
-the C<$:from> attribute of the new object if it can't start from
+the C<$.from> attribute of the new object if it can't start from
 the current position of C<mob>.
 
 =cut
@@ -60,17 +60,17 @@
     if has_grammar goto newfrom_2
     grammar = classname mob
   newfrom_2:
-    target = getattribute mob, "PGE::Match\x0$:target"
-    from = getattribute mob, "PGE::Match\x0$:pos"
+    target = getattribute mob, "PGE::Match\x0$.target"
+    from = getattribute mob, "PGE::Match\x0$.pos"
     from = clone from
   new_me:
     $I0 = find_type grammar
     me = new $I0
-    setattribute me, "PGE::Match\x0$:target", target
-    setattribute me, "PGE::Match\x0$:from", from
+    setattribute me, "PGE::Match\x0$.target", target
+    setattribute me, "PGE::Match\x0$.from", from
     pos = new .Integer
     pos = -1
-    setattribute me, "PGE::Match\x0$:pos", pos
+    setattribute me, "PGE::Match\x0$.pos", pos
     if has_fromd == 0 goto end
     if from >= 0 goto end
     from = fromd
@@ -94,11 +94,11 @@
 .sub "next" :method
     .local pmc corou
 
-    corou = getattribute self, "PGE::Match\x0&:corou"
+    corou = getattribute self, "PGE::Match\x0&!corou"
     if_null corou, next_1
     goto next_2
   next_1:
-    $P0 = getattribute self, "PGE::Match\x0$:pos"
+    $P0 = getattribute self, "PGE::Match\x0$.pos"
     $P0 = -1
     goto end
   next_2:
@@ -116,7 +116,7 @@
 
 .sub "from" :method
     .local pmc from
-    from = getattribute self, "PGE::Match\x0$:from"
+    from = getattribute self, "PGE::Match\x0$.from"
     .return (from)
 .end
 
@@ -128,7 +128,7 @@
 
 .sub "to" :method
     .local pmc to
-    to = getattribute self, "PGE::Match\x0$:pos"
+    to = getattribute self, "PGE::Match\x0$.pos"
     .return (to)
 .end
 
@@ -140,7 +140,7 @@
 =cut
 
 .sub "__get_bool" :method
-    $P1 = getattribute self, "PGE::Match\x0$:pos"
+    $P1 = getattribute self, "PGE::Match\x0$.pos"
     $I0 = $P1
     $I1 = isge $I0, 0
     .return ($I1)
@@ -177,9 +177,9 @@
 =cut
 
 .sub "__get_string" :method
-    $P0 = getattribute self, "PGE::Match\x0$:target"
-    $P1 = getattribute self, "PGE::Match\x0$:from"
-    $P2 = getattribute self, "PGE::Match\x0$:pos"
+    $P0 = getattribute self, "PGE::Match\x0$.target"
+    $P1 = getattribute self, "PGE::Match\x0$.from"
+    $P2 = getattribute self, "PGE::Match\x0$.pos"
     if $P2 < 0 goto false
     if $P2 <= $P1 goto false
     $I1 = $P1
@@ -201,7 +201,7 @@
 
 .sub "__get_string_keyed_int" :method
        .param int key
-    $P0 = getattribute self, "PGE::Match\x0@:capt"
+    $P0 = getattribute self, "PGE::[EMAIL PROTECTED]"
        $S0 = ''
     if_null $P0, get_1
     $P0 = $P0[key]
@@ -220,7 +220,7 @@
 
 .sub "__get_pmc_keyed_int" :method
     .param int key
-    $P0 = getattribute self, "PGE::Match\x0@:capt"
+    $P0 = getattribute self, "PGE::[EMAIL PROTECTED]"
     if_null $P0, get_1
     $P0 = $P0[key]
   get_1:
@@ -231,10 +231,10 @@
     .param int key
     .param pmc val
     .local pmc capt
-    capt = getattribute self, "PGE::Match\x0@:capt"
+    capt = getattribute self, "PGE::[EMAIL PROTECTED]"
     unless_null capt, set_1
     capt = new .ResizablePMCArray
-    setattribute self, "PGE::Match\x0@:capt", capt
+    setattribute self, "PGE::[EMAIL PROTECTED]", capt
   set_1:
     capt[key] = val
 .end
@@ -242,7 +242,7 @@
 .sub "__delete_keyed_int" :method
     .param int key
     .local pmc capt
-    capt = getattribute self, "PGE::Match\x0@:capt"
+    capt = getattribute self, "PGE::[EMAIL PROTECTED]"
     delete capt[key]
 .end
 
@@ -250,7 +250,7 @@
     .param int key
     .local pmc capt
     $I0 = 0
-    capt = getattribute self, "PGE::Match\x0@:capt"
+    capt = getattribute self, "PGE::[EMAIL PROTECTED]"
     if_null capt, end
     $I0 = defined capt[key]
   end:
@@ -276,7 +276,7 @@
 
 .sub "get_array" :method
     .local pmc array
-    array = getattribute self, "PGE::Match\x0@:capt"
+    array = getattribute self, "PGE::[EMAIL PROTECTED]"
     .return (array)
 .end
 

Modified: trunk/compilers/pge/PGE/OPTable.pir
==============================================================================
--- trunk/compilers/pge/PGE/OPTable.pir (original)
+++ trunk/compilers/pge/PGE/OPTable.pir Fri Mar 17 08:29:30 2006
@@ -66,11 +66,11 @@
 .sub "__onload" :load
     .local pmc base
     base = newclass "PGE::OPTable"
-    addattribute base, "%:toktable"
-    addattribute base, "%:termtable"
-    addattribute base, "%:opertable"
-    addattribute base, "%:wstermtable"
-    addattribute base, "%:wsopertable"
+    addattribute base, "%!toktable"
+    addattribute base, "%!termtable"
+    addattribute base, "%!opertable"
+    addattribute base, "%!wstermtable"
+    addattribute base, "%!wsopertable"
 .end
 
 =item C<__init()>
@@ -81,16 +81,16 @@
 
 .sub "__init" :method
     $P0 = new .Hash
-    setattribute self, "PGE::OPTable\x0%:toktable", $P0
+    setattribute self, "PGE::OPTable\x0%!toktable", $P0
     $I0 = find_type "PGE::TokenHash"
     $P0 = new $I0
-    setattribute self, "PGE::OPTable\x0%:termtable", $P0
+    setattribute self, "PGE::OPTable\x0%!termtable", $P0
     $P0 = new $I0
-    setattribute self, "PGE::OPTable\x0%:wstermtable", $P0
+    setattribute self, "PGE::OPTable\x0%!wstermtable", $P0
     $P0 = new $I0
-    setattribute self, "PGE::OPTable\x0%:opertable", $P0
+    setattribute self, "PGE::OPTable\x0%!opertable", $P0
     $P0 = new $I0
-    setattribute self, "PGE::OPTable\x0%:wsopertable", $P0
+    setattribute self, "PGE::OPTable\x0%!wsopertable", $P0
 .end
 
 =back
@@ -137,11 +137,11 @@
     .local string tok1, tok2
     .local int nows
 
-    toktable = getattribute self, "PGE::OPTable\x0%:toktable"
-    termtable = getattribute self, "PGE::OPTable\x0%:termtable"
-    opertable = getattribute self, "PGE::OPTable\x0%:opertable"
-    wstermtable = getattribute self, "PGE::OPTable\x0%:wstermtable"
-    wsopertable = getattribute self, "PGE::OPTable\x0%:wsopertable"
+    toktable = getattribute self, "PGE::OPTable\x0%!toktable"
+    termtable = getattribute self, "PGE::OPTable\x0%!termtable"
+    opertable = getattribute self, "PGE::OPTable\x0%!opertable"
+    wstermtable = getattribute self, "PGE::OPTable\x0%!wstermtable"
+    wsopertable = getattribute self, "PGE::OPTable\x0%!wsopertable"
 
     if has_match goto set_equiv
     match = new .String
@@ -265,10 +265,10 @@
     .local string key
     .local pmc newfrom, mfrom, mpos
 
-    termtable = getattribute self, "PGE::OPTable\x0%:termtable"
-    opertable = getattribute self, "PGE::OPTable\x0%:opertable"
-    wstermtable = getattribute self, "PGE::OPTable\x0%:wstermtable"
-    wsopertable = getattribute self, "PGE::OPTable\x0%:wsopertable"
+    termtable = getattribute self, "PGE::OPTable\x0%!termtable"
+    opertable = getattribute self, "PGE::OPTable\x0%!opertable"
+    wstermtable = getattribute self, "PGE::OPTable\x0%!wstermtable"
+    wsopertable = getattribute self, "PGE::OPTable\x0%!wsopertable"
     termstack = new .ResizablePMCArray
     operstack = new .ResizablePMCArray
     tokstack = new .ResizablePMCArray

Modified: trunk/compilers/pge/PGE/P5Regexp.pir
==============================================================================
--- trunk/compilers/pge/PGE/P5Regexp.pir        (original)
+++ trunk/compilers/pge/PGE/P5Regexp.pir        Fri Mar 17 08:29:30 2006
@@ -57,9 +57,9 @@
     .local int litstart, litlen
     .local string initchar
     newfrom = find_global "PGE::Match", "newfrom"
-    $P0 = getattribute mob, "PGE::Match\x0$:target"
+    $P0 = getattribute mob, "PGE::Match\x0$.target"
     target = $P0
-    $P0 = getattribute mob, "PGE::Match\x0$:pos"
+    $P0 = getattribute mob, "PGE::Match\x0$.pos"
     pos = $P0
     lastpos = length target
     initchar = substr target, pos, 1
@@ -95,7 +95,7 @@
     mob["value"] = $S0
     goto end
   end:
-    $P0 = getattribute mob, "PGE::Match\x0$:pos"
+    $P0 = getattribute mob, "PGE::Match\x0$.pos"
     $P0 = pos
     .return (mob)
 .end

Modified: trunk/compilers/pge/PGE/P6Rule.pir
==============================================================================
--- trunk/compilers/pge/PGE/P6Rule.pir  (original)
+++ trunk/compilers/pge/PGE/P6Rule.pir  Fri Mar 17 08:29:30 2006
@@ -97,9 +97,9 @@
     .local string initchar
     .local int base, isnegated
     newfrom = find_global "PGE::Match", "newfrom"
-    $P0 = getattribute mob, "PGE::Match\x0$:target"
+    $P0 = getattribute mob, "PGE::Match\x0$.target"
     target = $P0
-    $P0 = getattribute mob, "PGE::Match\x0$:pos"
+    $P0 = getattribute mob, "PGE::Match\x0$.pos"
     pos = $P0
     lastpos = length target
 
@@ -201,7 +201,7 @@
     if pos > 0 goto term_ws_1
     pos = lastpos
   end:
-    $P0 = getattribute mob, "PGE::Match\x0$:pos"
+    $P0 = getattribute mob, "PGE::Match\x0$.pos"
     $P0 = pos
     .return (mob)
 
@@ -509,9 +509,9 @@
     .local pmc newfrom, mfrom, mpos
     .local string cname
     newfrom = find_global "PGE::Match", "newfrom"
-    $P0 = getattribute mob, "PGE::Match\x0$:target"
+    $P0 = getattribute mob, "PGE::Match\x0$.target"
     target = $P0
-    $P0 = getattribute mob, "PGE::Match\x0$:pos"
+    $P0 = getattribute mob, "PGE::Match\x0$.pos"
     pos = $P0
     lastpos = length target
     inc pos
@@ -567,7 +567,7 @@
     .param pmc mob
     .param int pos
     .param string message
-    $P0 = getattribute mob, "PGE::Match\x0$:pos"
+    $P0 = getattribute mob, "PGE::Match\x0$.pos"
     $P0 = pos
     $P0 = new .Exception
     $S0 = "p6rule parse error: "
@@ -576,7 +576,7 @@
     $S1 = pos
     $S0 .= $S1
     $S0 .= ", found '"
-    $P1 = getattribute mob, "PGE::Match\x0$:target"
+    $P1 = getattribute mob, "PGE::Match\x0$.target"
     $S1 = $P1
     $S1 = substr $S1, pos, 1
     $S0 .= $S1

Modified: trunk/compilers/pge/PGE/Rule.pir
==============================================================================
--- trunk/compilers/pge/PGE/Rule.pir    (original)
+++ trunk/compilers/pge/PGE/Rule.pir    Fri Mar 17 08:29:30 2006
@@ -19,7 +19,7 @@
     base = getclass "PGE::Match"
     $P0 = subclass base, "PGE::Rule"
     $P0 = new .Hash
-    store_global "PGE::Rule", "%:cache", $P0
+    store_global "PGE::Rule", "%!cache", $P0
     .return ()
 .end
 
@@ -413,7 +413,7 @@
     mpos = pos
     $P0 = corou
     $P0 = clone $P0
-    setattribute mob, "PGE::Match\x0&:corou", $P0
+    setattribute mob, "PGE::Match\x0&!corou", $P0
     $P0(mob, mfrom, mpos)
     .return (mob)
   nobacktrack:
@@ -435,7 +435,7 @@
     dec mpos
     if mpos > mfrom goto loop
     null $P0
-    setattribute mob, "PGE::Match\x0&:corou", $P0
+    setattribute mob, "PGE::Match\x0&!corou", $P0
     goto loop
 .end
 
@@ -458,7 +458,7 @@
     mob = fail(mob)
     .return (mob)
   lookahead:
-    cache = find_global "PGE::Rule", "%:cache"
+    cache = find_global "PGE::Rule", "%!cache"
     $I0 = exists cache[pattern]
     if $I0 == 0 goto new_pattern
     rule = cache[pattern]
@@ -470,11 +470,11 @@
   match:
     mob = rule(mob)
     unless mob goto end
-    $P0 = getattribute mob, "PGE::Match\x0$:from"
-    $P1 = getattribute mob, "PGE::Match\x0$:pos"
+    $P0 = getattribute mob, "PGE::Match\x0$.from"
+    $P1 = getattribute mob, "PGE::Match\x0$.pos"
     assign $P1, $P0
     null $P0
-    setattribute mob, "PGE::Match\x0&:corou", $P0
+    setattribute mob, "PGE::Match\x0&!corou", $P0
   end:
     .return (mob)
 .end
@@ -508,7 +508,7 @@
   lookbehind:
     pattern = concat "[", pattern
     pattern = concat pattern, "]$"
-    cache = find_global "PGE::Rule", "%:cache"
+    cache = find_global "PGE::Rule", "%!cache"
     $I0 = exists cache[pattern]
     if $I0 == 0 goto new_pattern
     rule = cache[pattern]
@@ -518,19 +518,19 @@
     rule = $P0(pattern)
     cache[pattern] = rule
   match:
-    $P0 = getattribute mob, "PGE::Match\x0$:target"
+    $P0 = getattribute mob, "PGE::Match\x0$.target"
     $S0 = $P0
-    $P0 = getattribute mob, "PGE::Match\x0$:pos"
+    $P0 = getattribute mob, "PGE::Match\x0$.pos"
     from = $P0
     $S0 = substr $S0, 0, from
     mob = rule($S0)
     unless mob goto end
-    $P0 = getattribute mob, "PGE::Match\x0$:from"
-    $P1 = getattribute mob, "PGE::Match\x0$:pos"
+    $P0 = getattribute mob, "PGE::Match\x0$.from"
+    $P1 = getattribute mob, "PGE::Match\x0$.pos"
     $P0 = from
     $P1 = from
     null $P0
-    setattribute mob, "PGE::Match\x0&:corou", $P0
+    setattribute mob, "PGE::Match\x0&!corou", $P0
   end:
     .return (mob)
 .end

Modified: trunk/compilers/pge/PGE/TokenHash.pir
==============================================================================
--- trunk/compilers/pge/PGE/TokenHash.pir       (original)
+++ trunk/compilers/pge/PGE/TokenHash.pir       Fri Mar 17 08:29:30 2006
@@ -9,8 +9,8 @@
 .sub "__onload" :load
     .local pmc class
     class = newclass "PGE::TokenHash"
-    addattribute class, ".ihash"
-    addattribute class, ".vhash"
+    addattribute class, "%!ihash"
+    addattribute class, "%!vhash"
     .return ()
 .end
 
@@ -18,15 +18,15 @@
     .local pmc ihash, vhash
     ihash = new .Hash
     vhash = new .Hash
-    setattribute self, "PGE::TokenHash\x0.ihash", ihash
-    setattribute self, "PGE::TokenHash\x0.vhash", vhash
+    setattribute self, "PGE::TokenHash\x0%!ihash", ihash
+    setattribute self, "PGE::TokenHash\x0%!vhash", vhash
     .return ()
 .end
 
 .sub "__get_pmc_keyed" :method
     .param pmc key_p
     .local pmc vhash
-    vhash = getattribute self, "PGE::TokenHash\x0.vhash"
+    vhash = getattribute self, "PGE::TokenHash\x0%!vhash"
     $P0 = vhash[key_p]
     .return ($P0)
 .end
@@ -40,8 +40,8 @@
     .local string c
 
     key = key_p
-    vhash = getattribute self, "PGE::TokenHash\x0.vhash"
-    ihash = getattribute self, "PGE::TokenHash\x0.ihash"
+    vhash = getattribute self, "PGE::TokenHash\x0%!vhash"
+    ihash = getattribute self, "PGE::TokenHash\x0%!ihash"
     vhash[key_p] = value
 
     c = substr key, 0, 1
@@ -56,14 +56,14 @@
 .sub "__exists_keyed" :method
     .param pmc key_p
     .local pmc vhash
-    vhash = getattribute self, "PGE::TokenHash\x0.vhash"
+    vhash = getattribute self, "PGE::TokenHash\x0%!vhash"
     $I0 = exists vhash[key_p]
     .return ($I0)
 .end
 
 .sub "__get_integer" :method
     .local pmc vhash
-    vhash = getattribute self, "PGE::TokenHash\x0.vhash"
+    vhash = getattribute self, "PGE::TokenHash\x0%!vhash"
     $I0 = vhash
     .return ($I0)
 .end
@@ -74,8 +74,8 @@
     .local string c
     .local pmc ihash, vhash
     .local int len
-    ihash = getattribute self, "PGE::TokenHash\x0.ihash"
-    vhash = getattribute self, "PGE::TokenHash\x0.vhash"
+    ihash = getattribute self, "PGE::TokenHash\x0%!ihash"
+    vhash = getattribute self, "PGE::TokenHash\x0%!vhash"
     c = substr key, pos, 1
     len = ihash[c]
     c = substr key, pos, len

Modified: trunk/runtime/parrot/library/PGE/Dumper.pir
==============================================================================
--- trunk/runtime/parrot/library/PGE/Dumper.pir (original)
+++ trunk/runtime/parrot/library/PGE/Dumper.pir Fri Mar 17 08:29:30 2006
@@ -122,7 +122,7 @@
     $I0 = self
     print $I0
     print "\n"
-    capt = getattribute self, "PGE::Match\x0@:capt"
+    capt = getattribute self, "PGE::[EMAIL PROTECTED]"
     if_null capt, subrules
     spi = 0
     spc = elements capt

Modified: trunk/runtime/parrot/library/PGE/Hs.pir
==============================================================================
--- trunk/runtime/parrot/library/PGE/Hs.pir     (original)
+++ trunk/runtime/parrot/library/PGE/Hs.pir     Fri Mar 17 08:29:30 2006
@@ -51,8 +51,8 @@
 .namespace [ "PGE::Hs" ]
 
 .const string PGE_FAIL = "PGE_Fail"
-.const string PGE_SUB_POS = "@:capt"
-.const string PGE_SUB_NAMED = "%:capt"
+.const string PGE_SUB_POS = "@!capt"
+.const string PGE_SUB_NAMED = "%!capt"
 
 .sub "__onload" :load
     .local pmc load

Reply via email to