Author: allison
Date: Sun Sep 30 21:53:41 2007
New Revision: 21706
Modified:
branches/pdd15oo/compilers/pge/PGE/P5Regex.pir
branches/pdd15oo/compilers/pge/PGE/P6Regex.pir
Log:
[pdd15oo] Fixing a few more partially changed hierarchical namespaces.
Modified: branches/pdd15oo/compilers/pge/PGE/P5Regex.pir
==============================================================================
--- branches/pdd15oo/compilers/pge/PGE/P5Regex.pir (original)
+++ branches/pdd15oo/compilers/pge/PGE/P5Regex.pir Sun Sep 30 21:53:41 2007
@@ -132,7 +132,7 @@
.local int pos, lastpos
.local int litstart, litlen
.local string initchar
- newfrom = get_hll_global ["PGE::Match"], "newfrom"
+ newfrom = get_hll_global ["PGE";"Match"], "newfrom"
(mob, target, $P0, $P1) = newfrom(mob, 0, "PGE::Exp::Literal")
pos = $P0
lastpos = length target
@@ -175,7 +175,7 @@
mob.'result_object'($S0)
goto end
end:
- $P0 = getattribute mob, "PGE::Match\x0$.pos"
+ $P0 = getattribute mob, ['PGE';'Match'], "$.pos"
$P0 = pos
.return (mob)
.end
@@ -188,7 +188,7 @@
.local pmc mfrom, mpos
.local string key
key = mob['KEY']
- $P0 = get_hll_global ["PGE::Match"], "newfrom"
+ $P0 = get_hll_global ["PGE";"Match"], "newfrom"
(mob, target, mfrom, mpos) = $P0(mob, 0, "PGE::Exp::Quant")
pos = mfrom
lastpos = length target
@@ -244,7 +244,7 @@
.local string target
.local pmc mfrom, mpos
.local int pos, lastpos
- $P0 = get_hll_global ["PGE::Match"], "newfrom"
+ $P0 = get_hll_global ["PGE";"Match"], "newfrom"
(mob, target, mfrom, mpos) = $P0(mob, 0, "PGE::Exp::CGroup")
pos = mfrom
inc pos
@@ -267,7 +267,7 @@
.local string charlist
.local string key
key = mob['KEY']
- $P0 = get_hll_global ["PGE::Match"], "newfrom"
+ $P0 = get_hll_global ["PGE";"Match"], "newfrom"
(mob, target, mfrom, mpos) = $P0(mob, 0, "PGE::Exp::EnumCharList")
pos = mfrom
if key == '.' goto dot
Modified: branches/pdd15oo/compilers/pge/PGE/P6Regex.pir
==============================================================================
--- branches/pdd15oo/compilers/pge/PGE/P6Regex.pir (original)
+++ branches/pdd15oo/compilers/pge/PGE/P6Regex.pir Sun Sep 30 21:53:41 2007
@@ -80,7 +80,7 @@
## If we're passed the results of a previous parse, use it.
.local pmc match, exp
- $I0 = isa source, 'PGE::Match'
+ $I0 = isa source, ['PGE';'Match']
if $I0 == 0 goto parse
$P0 = source['expr']
if null $P0 goto parse
@@ -91,7 +91,7 @@
parse:
## Let's parse the source as a regex
- $P0 = get_hll_global ['PGE::Grammar'], 'regex'
+ $P0 = get_hll_global ['PGE';'Grammar'], 'regex'
match = $P0(source, adverbs :flat :named)
if source == '' goto err_null
if target != 'parse' goto check
@@ -131,7 +131,7 @@
=cut
-.namespace [ 'PGE::Grammar' ]
+.namespace [ 'PGE';'Grammar' ]
.sub 'regex'
.param pmc mob
@@ -584,7 +584,7 @@
.local int pos, lastpos
.local pmc newfrom, mfrom, mpos
.local string cname
- newfrom = get_hll_global ['PGE::Match'], 'newfrom'
+ newfrom = get_hll_global ['PGE';'Match'], 'newfrom'
$P0 = getattribute mob, '$.target'
target = $P0
$P0 = getattribute mob, '$.pos'
@@ -719,7 +719,7 @@
inc pos
mpos = pos
.local pmc regex
- regex = get_hll_global ['PGE::Grammar'], 'regex'
+ regex = get_hll_global ['PGE';'Grammar'], 'regex'
$P1 = regex(mob, 'stop'=>'>')
unless $P1 goto end
$S0 = $P1
@@ -1008,7 +1008,7 @@
.local string target
.local pmc mfrom, mpos
.local int pos, len
- $P0 = get_hll_global ["PGE::Match"], "newfrom"
+ $P0 = get_hll_global ["PGE";"Match"], "newfrom"
(mob, target, mfrom, mpos) = $P0(mob, 0, "PGE::Exp::Closure")
pos = mfrom
len = 2
