You are viewing a plain text version of this content. The canonical link for it is here.
Posted to embperl-cvs@perl.apache.org by ri...@apache.org on 2001/10/31 13:04:26 UTC
cvs commit: embperl/test/cmp rtfmeta.asc
richter 01/10/31 04:04:26
Modified: . Tag: Embperl2c Embperl.xs epcomp.c test.pl
Embperl Tag: Embperl2c Syntax.pm
Embperl/Syntax Tag: Embperl2c Perl.pm RTF.pm
test/cmp Tag: Embperl2c rtfmeta.asc
Log:
Embperl 2 - tree structure rewrite
Revision Changes Path
No revision
No revision
1.29.4.25 +4 -1 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.29.4.24
retrieving revision 1.29.4.25
diff -u -r1.29.4.24 -r1.29.4.25
--- Embperl.xs 2001/10/22 06:25:01 1.29.4.24
+++ Embperl.xs 2001/10/31 12:04:25 1.29.4.25
@@ -268,8 +268,11 @@
if (!r->bEP1Compat)
{
char * p = SvPV (sText, l) ;
- /* Node_appendChild (DomTree_self (r -> xCurrDomTree), ntypCDATA, 0, p, l, r -> xCurrNode, 0, 0) ; */
+ /*if Node_self(DomTree_self (r -> xCurrDomTree), r -> xCurrNode) -> nType == ntypDocumentFraq)
+ Node_appendChild (DomTree_self (r -> xCurrDomTree), r -> xCurrNode, r -> nCurrRepeatLevel, ntypCDATA, 0, p, l, 0, 0, NULL) ;
+ else*/
r -> xCurrNode = Node_insertAfter_CDATA (p, l, (r -> nCurrEscMode & 3)== 3?1 + (r -> nCurrEscMode & 4):r -> nCurrEscMode, DomTree_self (r -> xCurrDomTree), r -> xCurrNode, r -> nCurrRepeatLevel) ;
+
}
else
#endif
1.4.2.65 +9 -4 embperl/Attic/epcomp.c
Index: epcomp.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcomp.c,v
retrieving revision 1.4.2.64
retrieving revision 1.4.2.65
diff -u -r1.4.2.64 -r1.4.2.65
--- epcomp.c 2001/10/30 14:40:15 1.4.2.64
+++ epcomp.c 2001/10/31 12:04:25 1.4.2.65
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epcomp.c,v 1.4.2.64 2001/10/30 14:40:15 richter Exp $
+# $Id: epcomp.c,v 1.4.2.65 2001/10/31 12:04:25 richter Exp $
#
###################################################################################*/
@@ -1353,10 +1353,13 @@
if (pCurrReq -> bDebug & dbgCompile)
- lprintf (pCurrReq, "[%d]EPCOMP: #%d L%d -------> parent=%d node=%d type=%d text=%s (#%d,%s)\n",
+ {
+ char buf[20] ;
+ lprintf (pCurrReq, "[%d]EPCOMP: #%d L%d -------> parent=%d node=%d type=%d text=%s (#%d,%s) %s\n",
pCurrReq -> nPid, pNode -> xNdx, pNode -> nLinenumber,
Node_parentNode (pDomTree, pNode -> xNdx, 0), pNode -> xNdx,
- pNode -> nType, Node_selfNodeName(pNode), nNdx, pCmd?"compile":"-") ;
+ pNode -> nType, Node_selfNodeName(pNode), nNdx, pCmd?"compile":"-", (pCmd && pCmd -> bRemoveNode)?(sprintf (buf, "removenode=%d", pCmd -> bRemoveNode), buf):"") ;
+ }
if (pCmd == NULL || (pCmd -> bRemoveNode & 1) == 0)
@@ -1826,6 +1829,7 @@
tDomTree * pDomTree ;
tDomTree * pCurrDomTree ;
+ #if 0
if (SvIOK (pDomTreeSV))
if (xOrgDomTree = SvIVX (pDomTreeSV))
{
@@ -1841,6 +1845,7 @@
lprintf (pCurrReq, "[%d]SUB: Enter from DomTree=%d into DomTree=%d, Source DomTree=%d \n", pCurrReq -> nPid, r -> xCurrDomTree, xOrgDomTree, xDomTree) ;
return r -> xCurrDomTree = xOrgDomTree ;*/ /* DomTree already cloned */
}
+#endif
av_push (pSaveAV, newSViv (r -> xCurrDomTree)) ;
av_push (pSaveAV, newSViv (r -> xCurrNode)) ;
@@ -1903,7 +1908,7 @@
pCallerDomTree = DomTree_self (r -> xCurrDomTree) ;
/* xDocFraq = Node_replaceChildWithNode (pSubDomTree, pSubDomTree -> xDocument, pCallerDomTree, r -> xCurrNode) ; */
- r -> xCurrNode = xDocFraq = Node_insertAfter (pSubDomTree, pSubDomTree -> xDocument, 0, pCallerDomTree, r -> xCurrNode, 0) ;
+ r -> xCurrNode = xDocFraq = Node_insertAfter (pSubDomTree, pSubDomTree -> xDocument, 0, pCallerDomTree, r -> xCurrNode, r -> nCurrRepeatLevel) ;
/* Element_selfSetAttribut (pCallerDomTree, Node_self (pCallerDomTree, xDocFraq), NULL, xOrderIndexAttr, NULL, nOrderNdx, 0) ; */
1.70.4.82 +3 -1 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.81
retrieving revision 1.70.4.82
diff -u -r1.70.4.81 -r1.70.4.82
--- test.pl 2001/10/25 14:49:01 1.70.4.81
+++ test.pl 2001/10/31 12:04:26 1.70.4.82
@@ -1,5 +1,6 @@
#!/usr/bin/perl --
+
###################################################################################
#
# Embperl - Copyright (c) 1997-2001 Gerald Richter / ECOS
@@ -11,7 +12,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: test.pl,v 1.70.4.81 2001/10/25 14:49:01 richter Exp $
+# $Id: test.pl,v 1.70.4.82 2001/10/31 12:04:26 richter Exp $
#
###################################################################################
@@ -706,6 +707,7 @@
'pod/pod.asc' => {
'version' => 2,
'syntax' => 'POD',
+ 'condition' => '!$EPWIN32',
},
'xml/pod.xml' => {
'version' => 2,
No revision
No revision
1.1.4.46 +2 -1 embperl/Embperl/Attic/Syntax.pm
Index: Syntax.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Syntax.pm,v
retrieving revision 1.1.4.45
retrieving revision 1.1.4.46
diff -u -r1.1.4.45 -r1.1.4.46
--- Syntax.pm 2001/10/25 08:26:04 1.1.4.45
+++ Syntax.pm 2001/10/31 12:04:26 1.1.4.46
@@ -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.45 2001/10/25 08:26:04 richter Exp $
+# $Id: Syntax.pm,v 1.1.4.46 2001/10/31 12:04:26 richter Exp $
#
###################################################################################
@@ -245,6 +245,7 @@
}
$self -> {-name} = $name ;
+
BuildTokenTable ($self) ;
$Syntax{$name} = $self ;
return $self ;
No revision
No revision
1.1.2.5 +2 -2 embperl/Embperl/Syntax/Attic/Perl.pm
Index: Perl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/Perl.pm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- Perl.pm 2001/04/26 13:13:07 1.1.2.4
+++ Perl.pm 2001/10/31 12:04:26 1.1.2.5
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Perl.pm,v 1.1.2.4 2001/04/26 13:13:07 richter Exp $
+# $Id: Perl.pm,v 1.1.2.5 2001/10/31 12:04:26 richter Exp $
#
###################################################################################
@@ -49,7 +49,7 @@
{
$self -> {-perlInit} = 1 ;
- $self -> AddInitCode (undef, '$_ep_node=%$x%; %#1% ;', undef,
+ $self -> AddInitCode (undef, '$_ep_node=%$x%+2; %#1% ;', undef,
{
removenode => 32,
compilechilds => 0,
1.1.2.21 +5 -7 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.20
retrieving revision 1.1.2.21
diff -u -r1.1.2.20 -r1.1.2.21
--- RTF.pm 2001/09/10 10:06:09 1.1.2.20
+++ RTF.pm 2001/10/31 12:04:26 1.1.2.21
@@ -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.20 2001/09/10 10:06:09 richter Exp $
+# $Id: RTF.pm,v 1.1.2.21 2001/10/31 12:04:26 richter Exp $
#
###################################################################################
@@ -203,10 +203,10 @@
$self -> AddRTFCmd ('NEXT',
{
perlcode => '$_ep_rtf_ndx++;',
+ 'removenode' => 1,
},
{
'nodename' => '::::NEXT',
- 'removenode' => 1,
'cdatatype' => 0,
}) ;
@@ -216,7 +216,6 @@
},
{
'nodename' => '::::MERGEREC',
- 'removenode' => 1,
'cdatatype' => 0,
},
{
@@ -230,7 +229,6 @@
},
{
'nodename' => '::::MERGESEQ',
- 'removenode' => 1,
'cdatatype' => 0,
},
{
@@ -242,10 +240,10 @@
{
perlcode => '@_ep_rtf_tmp=();%>\'-1% =~ /^\s*(.*?)\s*$/ ; $_ep_rtf_preif=$1;',
compiletimeperlcode => q[$_ep_rtf_inside = 1 ; $_ep_rtf_code = '{ my $itmp = $true?$_ep_rtf_tmp[3]:$_ep_rtf_tmp[4]; _ep_rp($x, \'{\'.$_ep_rtf_preif.(($itmp =~ /^\\\\\\\\/) || !$_ep_rtf_preif?$itmp:" $itmp").\'}\');}' ; $_ep_rtf_cmd = 1 ; ],
+ 'removenode' => 1,
},
{
'nodename' => '::::IF',
- 'removenode' => 1,
'cdatatype' => 0,
},
) ;
@@ -254,10 +252,10 @@
{
perlcode => '@_ep_rtf_tmp=();',
compiletimeperlcode => q[$_ep_rtf_inside = 1 ; $_ep_rtf_code = '$_ep_rtf_ndx++ if ($true); ' ; $_ep_rtf_cmd = 1 ;],
+ 'removenode' => 1,
},
{
'nodename' => '::::NEXTIF',
- 'removenode' => 1,
'cdatatype' => 0,
},
) ;
@@ -266,10 +264,10 @@
{
perlcode => '@_ep_rtf_tmp=();',
compiletimeperlcode => q[$_ep_rtf_inside = 1 ; $_ep_rtf_code = '$_ep_rtf_ndx+=2 if ($true); ' ; $_ep_rtf_cmd = 1 ; ],
+ 'removenode' => 1,
},
{
'nodename' => '::::NEXTIF',
- 'removenode' => 1,
'cdatatype' => 0,
},
) ;
No revision
No revision
1.1.2.3 +8 -4 embperl/test/cmp/Attic/rtfmeta.asc
Index: rtfmeta.asc
===================================================================
RCS file: /home/cvs/embperl/test/cmp/Attic/rtfmeta.asc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- rtfmeta.asc 2001/09/10 10:06:09 1.1.2.2
+++ rtfmeta.asc 2001/10/31 12:04:26 1.1.2.3
@@ -1,4 +1,4 @@
-{\rtf1
+{\rtf1
{}
{l=, p=Richter}
{ Sehr }
@@ -16,12 +16,15 @@
{}
{ \par Es handelt sich um Kur Nr}{11}
-{}
+
+{}{}
{ \par Es handelt sich um Kur Nr}{12}
-{}
+
+{}{}
{ \par Es handelt sich um Kur Nr}{13}
+
{}
{l=Richter, p=Weis}
{ Sehr }
@@ -39,7 +42,8 @@
{}
{ \par Es handelt sich um Kur Nr}{21}
-{}
+
+{}{}
{ \par Es handelt sich um Kur Nr}{22}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org