Permalink
Browse files

Always enclose namespace names in brackets for new pdd21 opcodes.

This patch brings PGE up to this spec.

git-svn-id: https://svn.parrot.org/parrot/trunk@13559 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information...
1 parent c4d6d5d commit a96d26592d26eeeffb45048705509b489da911ae Chip Salzenberg committed Jul 25, 2006
@@ -65,7 +65,7 @@ tree as a PIR code object that can be compiled.
.local pmc exp
.local string explabel
exp = self
- set_hll_global 'PGE::Exp', '$!group', exp
+ set_hll_global ['PGE::Exp'], '$!group', exp
exp = exp.reduce(self)
## we don't need a coroutine if :ratchet is set
@@ -565,11 +565,11 @@ tree as a PIR code object that can be compiled.
.local pmc group
## Temporarily store this group as the current group. Any
## cut nodes we encounter will set a cutmark into this group.
- group = get_hll_global 'PGE::Exp', '$!group'
- set_hll_global 'PGE::Exp', '$!group', self
+ group = get_hll_global ['PGE::Exp'], '$!group'
+ set_hll_global ['PGE::Exp'], '$!group', self
exp = self[0]
exp = exp.reduce(next)
- set_hll_global 'PGE::Exp', '$!group', group
+ set_hll_global ['PGE::Exp'], '$!group', group
$I0 = self['cutmark']
if $I0 > 0 goto keep_group
$I0 = self['iscapture']
@@ -725,7 +725,7 @@ tree as a PIR code object that can be compiled.
%L: # grammar subrule %0::%1
(captob, $P9, $P9, $P0) = captscope.'newfrom'(pos, '%0')
$P0 = pos
- $P0 = get_hll_global '%0', '%1'
+ $P0 = get_hll_global ['%0'], '%1'
CODE
goto subrule_match
@@ -1107,7 +1107,7 @@ tree as a PIR code object that can be compiled.
## This node is cutting a group. We need to
## get the current group's cutmark, or set
## one if it doesn't already have one.
- group = get_hll_global 'PGE::Exp', '$!group'
+ group = get_hll_global ['PGE::Exp'], '$!group'
cutmark = group['cutmark']
if cutmark > 0 goto has_cutmark
$P1 = new 'PGE::CodeString'
@@ -1321,7 +1321,7 @@ tree as a PIR code object that can be compiled.
$S0 = concat %2, ':"'
$S1 = %3
$S0 .= $S1
- $P0 = get_hll_global 'PGE::Match', '%!cache'
+ $P0 = get_hll_global ['PGE::Match'], '%!cache'
$I0 = exists $P0[$S0]
if $I0 goto %0_1
$P1 = compreg %2
@@ -93,7 +93,7 @@ Adds (or replaces) a syntactic category's defaults.
key = substr name, $I0
.local pmc sctable, token
- sctable = get_hll_global "PGE::OPTable", "%!sctable"
+ sctable = get_hll_global ["PGE::OPTable"], "%!sctable"
$I0 = exists sctable[syncat]
if $I0 == 0 goto token_hash
token = sctable[syncat]
@@ -273,7 +273,7 @@ Adds (or replaces) a syntactic category's defaults.
operstack = new .ResizablePMCArray
termstack = new .ResizablePMCArray
- newfrom = get_hll_global "PGE::Match", "newfrom"
+ newfrom = get_hll_global ["PGE::Match"], "newfrom"
(mob, target, mfrom, mpos) = newfrom(mob, 0)
pos = mfrom
lastpos = length target
@@ -19,7 +19,7 @@
target = adverbs['target']
.local pmc match
- $P0 = get_hll_global "PGE::Grammar", "p5regex"
+ $P0 = get_hll_global ["PGE::Grammar"], "p5regex"
match = $P0(source)
if target != 'parse' goto check
.return (match)
@@ -60,7 +60,7 @@
.sub "p5regex"
.param pmc mob
.local pmc optable
- optable = get_hll_global "PGE::P5Regex", "$optable"
+ optable = get_hll_global ["PGE::P5Regex"], "$optable"
$P0 = optable."parse"(mob)
.return ($P0)
.end
@@ -77,9 +77,9 @@
$I0 = find_type "PGE::OPTable"
optable = new $I0
- set_hll_global "PGE::P5Regex", "$optable", optable
+ set_hll_global ["PGE::P5Regex"], "$optable", optable
- $P0 = get_hll_global "PGE::P5Regex", "parse_lit"
+ $P0 = get_hll_global ["PGE::P5Regex"], "parse_lit"
optable.addtok("term:", "", "nows", $P0)
optable.addtok("term:\\b", "term:", "nows", "PGE::Exp::Anchor")
optable.addtok("term:\\B", "term:", "nows", "PGE::Exp::Anchor")
@@ -96,11 +96,11 @@
optable.addtok("circumfix:( )", "term:", "nows,nullterm", 'PGE::Exp::CGroup')
optable.addtok("circumfix:(?: )", "term:", "nows,nullterm", 'PGE::Exp::Group')
- $P0 = get_hll_global "PGE::P5Regex", "parse_enumclass"
+ $P0 = get_hll_global ["PGE::P5Regex"], "parse_enumclass"
optable.addtok("term:[", "", "nows", $P0)
optable.addtok("term:.", "", "nows", $P0)
- $P0 = get_hll_global "PGE::P5Regex", "parse_quant"
+ $P0 = get_hll_global ["PGE::P5Regex"], "parse_quant"
optable.addtok("postfix:*", "<term:", "left,nows", $P0)
optable.addtok("postfix:+", "postfix:*", "left,nows", $P0)
optable.addtok("postfix:?", "postfix:*", "left,nows", $P0)
@@ -112,7 +112,7 @@
optable.addtok("close:}", "<infix:|", "nows") # XXX: hack
optable.addtok("close:]", "close:}", "nows") # XXX: hack
- $P0 = get_hll_global "PGE::P5Regex", "compile_p5regex"
+ $P0 = get_hll_global ["PGE::P5Regex"], "compile_p5regex"
compreg "PGE::P5Regex", $P0
.end
@@ -124,7 +124,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
@@ -174,7 +174,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
@@ -230,7 +230,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
@@ -253,7 +253,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
@@ -90,7 +90,7 @@ or the resulting PIR code (target='PIR').
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 target != 'parse' goto check
.return (match)
@@ -160,8 +160,8 @@ parse valid Perl 6 regular expressions.
.local string stop
.local pmc stopstack, optable, match
- stopstack = get_hll_global 'PGE::P6Regex', '@!stopstack'
- optable = get_hll_global 'PGE::P6Regex', '$optable'
+ stopstack = get_hll_global ['PGE::P6Regex'], '@!stopstack'
+ optable = get_hll_global ['PGE::P6Regex'], '$optable'
stop = adverbs['stop']
push stopstack, stop
@@ -274,13 +274,13 @@ needed for compiling regexes.
# Create and store closure preprocessors in %closure_pp
$P0 = new .Hash
- set_hll_global 'PGE::P6Regex', '%closure_pp', $P0
- $P1 = get_hll_global 'PGE::P6Regex', 'PIR_closure'
+ set_hll_global ['PGE::P6Regex'], '%closure_pp', $P0
+ $P1 = get_hll_global ['PGE::P6Regex'], 'PIR_closure'
$P0["PIR"] = $P1
# Create an array for holding stop tokens
$P0 = new .ResizablePMCArray
- set_hll_global 'PGE::P6Regex', '@!stopstack', $P0
+ set_hll_global ['PGE::P6Regex'], '@!stopstack', $P0
$P0 = get_global 'compile_p6regex'
compreg 'PGE::P6Regex', $P0
@@ -308,7 +308,7 @@ Return a failed match if the stoptoken is found.
lastpos = length target
.local string stop
- $P0 = get_hll_global 'PGE::P6Regex', '@!stopstack'
+ $P0 = get_hll_global ['PGE::P6Regex'], '@!stopstack'
stop = $P0[-1]
.local string initchar
@@ -588,7 +588,7 @@ anchors, and match subscripts.
.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'
@@ -693,7 +693,7 @@ Parses a subrule token.
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
@@ -892,7 +892,7 @@ Parse a modifier.
.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
@@ -1331,7 +1331,7 @@ Parse a modifier.
lang = pad['lang']
self['lang'] = lang
# see if we need to do any pre-processing of the closure
- closure_pp = get_hll_global 'PGE::P6Regex', '%closure_pp'
+ closure_pp = get_hll_global ['PGE::P6Regex'], '%closure_pp'
$I0 = defined closure_pp[lang]
if $I0 == 0 goto end
closure_fn = closure_pp[lang]
Oops, something went wrong.

0 comments on commit a96d265

Please sign in to comment.