richter 01/05/02 12:13:03
Modified: Embperl Tag: Embperl2c Syntax.pm
Embperl/Syntax Tag: Embperl2c RTF.pm
test/html/rtf Tag: Embperl2c rtfbasic.asc
Log:
Embperl 2 - RTF syntax cont
Revision Changes Path
No revision
No revision
1.1.4.34 +9 -5 embperl/Embperl/Attic/Syntax.pm
Index: Syntax.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Syntax.pm,v
retrieving revision 1.1.4.33
retrieving revision 1.1.4.34
diff -u -r1.1.4.33 -r1.1.4.34
--- Syntax.pm 2001/05/02 14:35:22 1.1.4.33
+++ Syntax.pm 2001/05/02 19:12:43 1.1.4.34
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Syntax.pm,v 1.1.4.33 2001/05/02 14:35:22 richter Exp $
+# $Id: Syntax.pm,v 1.1.4.34 2001/05/02 19:12:43 richter Exp $
#
###################################################################################
@@ -253,13 +253,14 @@
sub CloneHash
{
- my ($self, $old, $replace, $seen) = @_ ;
+ my ($self, $old, $replace, $seen, $new) = @_ ;
- my $new = {} ;
+ $new ||= {} ;
$replace ||= {} ;
+ $seen ||= {$old => $new} ;
+
my ($v, $k) ;
- my $seen ||= {$old => $new} ;
while (($k, $v) = each (%$old))
@@ -278,7 +279,10 @@
}
else
{
- $seen -> {$v} = $new -> {$k} = $self -> CloneHash ($v,
$replace, $seen) ;
+ my $sub = {} ;
+ $seen -> {$v} = $sub ;
+ $self -> CloneHash ($v, $replace, $seen, $sub) ;
+ $new -> {$k} = $sub ;
}
}
elsif (ref ($v) eq 'ARRAY')
No revision
No revision
1.1.2.3 +6 -6 embperl/Embperl/Syntax/Attic/RTF.pm
Index: RTF.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/RTF.pm,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RTF.pm 2001/05/02 14:35:25 1.1.2.2
+++ RTF.pm 2001/05/02 19:12:53 1.1.2.3
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: RTF.pm,v 1.1.2.2 2001/05/02 14:35:25 richter Exp $
+# $Id: RTF.pm,v 1.1.2.3 2001/05/02 19:12:53 richter Exp $
#
###################################################################################
@@ -54,7 +54,7 @@
$self -> AddToRoot ($self -> {-rtfBlocks}) ;
- $self -> {-rtfCmds} = $self -> {-rtfBlocks}{'RTF field'}{'follow'}{'RTF
fieldstart'}{'inside'}{'RTF block'}{'follow'} ;
+ $self -> {-rtfCmds} = $self -> {-rtfBlocks}{'RTF field'}{'follow'}{'RTF
fieldstart'}{'follow'}{'RTF block cmd'}{'follow'} ;
Init ($self) ;
}
@@ -191,7 +191,7 @@
{
perlcode =>
[
- '_ep_rp(%$x%,scalar(%#0%));',
+ '_ep_rp(%$x%,scalar(%&<noname>%));',
],
removenode => 4,
compilechilds => 0,
@@ -201,7 +201,7 @@
{
perlcode =>
[
- '_ep_rp(%$x%,scalar(%#0%));',
+ '_ep_rp(%$x%,scalar(%&<noname>%));',
],
removenode => 4,
compilechilds => 0,
@@ -286,7 +286,7 @@
%CmdStart = (
'-lsearch' => 1,
- 'RTF block' => {
+ 'RTF block cmd' => {
'text' => '{',
'end' => '}',
'unescape' => 1,
@@ -308,7 +308,7 @@
'text' => '{\*\fldinst',
'end' => '}',
'unescape' => 1,
- 'inside' => \%CmdStart,
+ 'follow' => \%CmdStart,
},
) ;
No revision
No revision
1.1.2.2 +1 -1 embperl/test/html/rtf/Attic/rtfbasic.asc
Index: rtfbasic.asc
===================================================================
RCS file: /home/cvs/embperl/test/html/rtf/Attic/rtfbasic.asc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- rtfbasic.asc 2001/05/02 14:37:24 1.1.2.1
+++ rtfbasic.asc 2001/05/02 19:12:59 1.1.2.2
@@ -1,2 +1,2 @@
{Param[0]: }{\field{\*\fldinst { DOCVARIABLE $param[0] \\* MERGEFORMAT }}{\fldrslt
}}
-
+{Param[1]: }{\field{\*\fldinst { DOCVARIABLE $param[1] }}{\fldrslt }}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
