Author: pmichaud
Date: Fri Oct 5 01:05:08 2007
New Revision: 21885
Modified:
branches/pdd15oo/compilers/pge/PGE/Regex.pir
Log:
[pge]:
* Still closer, but now we're blocked on a load_bytecode issue
(being sent to mailing list).
Modified: branches/pdd15oo/compilers/pge/PGE/Regex.pir
==============================================================================
--- branches/pdd15oo/compilers/pge/PGE/Regex.pir (original)
+++ branches/pdd15oo/compilers/pge/PGE/Regex.pir Fri Oct 5 01:05:08 2007
@@ -76,10 +76,9 @@
=cut
-.sub "fail"
- .param pmc mob
+.sub "fail" :method
$P0 = get_hll_global ['PGE'], 'Match'
- .return $P0.'new'(mob)
+ .return $P0.'new'(self)
.end
@@ -89,9 +88,8 @@
=cut
-.sub 'upper'
- .param pmc mob
- .return '!cclass'(mob, .CCLASS_UPPERCASE)
+.sub 'upper' :method
+ .return '!cclass'(self, .CCLASS_UPPERCASE)
.end
@@ -101,9 +99,8 @@
=cut
-.sub "lower"
- .param pmc mob
- .return '!cclass'(mob, .CCLASS_LOWERCASE)
+.sub "lower" :method
+ .return '!cclass'(self, .CCLASS_LOWERCASE)
.end
@@ -113,9 +110,8 @@
=cut
-.sub "alpha"
- .param pmc mob
- .return '!cclass'(mob, .CCLASS_ALPHABETIC)
+.sub "alpha" :method
+ .return '!cclass'(self, .CCLASS_ALPHABETIC)
.end
=item C<digit()>
@@ -124,9 +120,8 @@
=cut
-.sub "digit"
- .param pmc mob
- .return '!cclass'(mob, .CCLASS_NUMERIC)
+.sub "digit" :method
+ .return '!cclass'(self, .CCLASS_NUMERIC)
.end
=item C<xdigit()>
@@ -135,9 +130,8 @@
=cut
-.sub "xdigit"
- .param pmc mob
- .return '!cclass'(mob, .CCLASS_HEXADECIMAL)
+.sub "xdigit" :method
+ .return '!cclass'(self, .CCLASS_HEXADECIMAL)
.end
=item C<space()>
@@ -146,9 +140,8 @@
=cut
-.sub "space"
- .param pmc mob
- .return '!cclass'(mob, .CCLASS_WHITESPACE)
+.sub "space" :method
+ .return '!cclass'(self, .CCLASS_WHITESPACE)
.end
=item C<print()>
@@ -157,9 +150,8 @@
=cut
-.sub "print"
- .param pmc mob
- .return '!cclass'(mob, .CCLASS_PRINTING)
+.sub "print" :method
+ .return '!cclass'(self, .CCLASS_PRINTING)
.end
=item C<graph()>
@@ -168,9 +160,8 @@
=cut
-.sub "graph"
- .param pmc mob
- .return '!cclass'(mob, .CCLASS_GRAPHICAL)
+.sub "graph" :method
+ .return '!cclass'(self, .CCLASS_GRAPHICAL)
.end
=item C<blank()>
@@ -179,9 +170,8 @@
=cut
-.sub "blank"
- .param pmc mob
- .return '!cclass'(mob, .CCLASS_BLANK)
+.sub "blank" :method
+ .return '!cclass'(self, .CCLASS_BLANK)
.end
=item C<cntrl()>
@@ -190,9 +180,8 @@
=cut
-.sub "cntrl"
- .param pmc mob
- .return '!cclass'(mob, .CCLASS_CONTROL)
+.sub "cntrl" :method
+ .return '!cclass'(self, .CCLASS_CONTROL)
.end
=item C<punct()>
@@ -201,9 +190,8 @@
=cut
-.sub "punct"
- .param pmc mob
- .return '!cclass'(mob, .CCLASS_PUNCTUATION)
+.sub "punct" :method
+ .return '!cclass'(self, .CCLASS_PUNCTUATION)
.end
=item C<alnum()>
@@ -212,9 +200,8 @@
=cut
-.sub "alnum"
- .param pmc mob
- .return '!cclass'(mob, .CCLASS_ALPHANUMERIC)
+.sub "alnum" :method
+ .return '!cclass'(self, .CCLASS_ALPHANUMERIC)
.end
=item C<sp()>
@@ -223,9 +210,8 @@
=cut
-.sub "sp"
- .param pmc mob
- .return '!literal'(mob, ' ')
+.sub "sp" :method
+ .return '!literal'(self, ' ')
.end
=item C<lt()>
@@ -234,9 +220,8 @@
=cut
-.sub "lt"
- .param pmc mob
- .return '!literal'(mob, '<')
+.sub "lt" :method
+ .return '!literal'(self, '<')
.end
=item C<gt()>
@@ -245,9 +230,8 @@
=cut
-.sub "gt"
- .param pmc mob
- .return '!literal'(mob, '>')
+.sub "gt" :method
+ .return '!literal'(self, '>')
.end
=item C<dot()>
@@ -256,9 +240,8 @@
=cut
-.sub "dot"
- .param pmc mob
- .return '!literal'(mob, '.')
+.sub "dot" :method
+ .return '!literal'(self, '.')
.end
=item C<ws()>
@@ -333,13 +316,12 @@
=cut
-.sub "wb"
- .param pmc mob
+.sub "wb" :method
.local string target
- .local pmc mfrom, mpos
+ .local pmc mob
.local int pos
$P0 = get_hll_global ['PGE'], 'Match'
- (mob, pos, target) = $P0.'new'(mob)
+ (mob, pos, target) = $P0.'new'(self)
if pos == 0 goto succeed
$I0 = length target
if pos == $I0 goto succeed
@@ -362,15 +344,14 @@
=cut
-.sub "before"
- .param pmc mob
+.sub "before" :method
.param string pattern :optional
.param int has_pattern :opt_flag
.param pmc adverbs :slurpy :named
- .local pmc cache, rule
+ .local pmc mob, cache, rule
if has_pattern goto lookahead
- mob = 'fail'(mob)
+ mob = 'fail'(self)
.return (mob)
lookahead:
cache = get_global '%!cache'
@@ -383,7 +364,7 @@
rule = $P0(pattern)
cache[pattern] = rule
match:
- mob = rule(mob)
+ mob = rule(self)
unless mob goto end
$P0 = getattribute mob, '$.from'
$P1 = getattribute mob, '$.pos'
@@ -410,14 +391,14 @@
=cut
-.sub "after"
- .param pmc mob
+.sub "after" :method
.param string pattern :optional
.param int has_pattern :opt_flag
.param pmc adverbs :slurpy :named
- .local pmc cache, rule
+ .local pmc mob, cache, rule
.local int from
+ mob = self
if has_pattern goto lookbehind
mob = fail(mob)
.return (mob)
