richter 01/04/16 11:32:32
Modified: . Tag: Embperl2c Changes.pod Embperl.pm MANIFEST
MANIFEST.2 epcomp.c epdom.c epdom.h
Embperl/Syntax Tag: Embperl2c EmbperlBlocks.pm
Added: test/cmp Tag: Embperl2c subtab.htm
Log:
Embperl 2 - fixed several bugs that caused weired behaviour with nested subs and
tables.
Revision Changes Path
No revision
No revision
1.129.4.12 +6 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.129.4.11
retrieving revision 1.129.4.12
diff -u -r1.129.4.11 -r1.129.4.12
--- Changes.pod 2001/03/29 05:28:40 1.129.4.11
+++ Changes.pod 2001/04/16 18:32:29 1.129.4.12
@@ -1,5 +1,11 @@
=pod
+=head1 2.0b3_dev
+
+ - fixed several bugs that caused weired behaviour with nested subs
+ and tables.
+
+
=head1 2.0b2 (BETA) 29. Mar 2001
- Embperl files can now debugged via the interavtive debugger.
1.118.4.29 +2 -2 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.118.4.28
retrieving revision 1.118.4.29
diff -u -r1.118.4.28 -r1.118.4.29
--- Embperl.pm 2001/03/29 05:28:41 1.118.4.28
+++ Embperl.pm 2001/04/16 18:32:29 1.118.4.29
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Embperl.pm,v 1.118.4.28 2001/03/29 05:28:41 richter Exp $
+# $Id: Embperl.pm,v 1.118.4.29 2001/04/16 18:32:29 richter Exp $
#
###################################################################################
@@ -86,7 +86,7 @@
##ep2##
-$VERSION = '2.0b2' ;
+$VERSION = '2.0b3_dev' ;
##/ep2##
##ep1##$VERSION = '1.3.2';
1.50.4.15 +2 -0 embperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/embperl/MANIFEST,v
retrieving revision 1.50.4.14
retrieving revision 1.50.4.15
diff -u -r1.50.4.14 -r1.50.4.15
--- MANIFEST 2001/03/29 05:28:41 1.50.4.14
+++ MANIFEST 2001/04/16 18:32:29 1.50.4.15
@@ -51,6 +51,7 @@
test/html/SSI/ssiinc.htm
test/html/SSIEP/ssiep.htm
test/html/registry/script.pl
+test/html/subtab.htm
test/cmp/incif.htm
test/cmp/executesub.htm
test/cmp/ssibasic.htm
@@ -59,6 +60,7 @@
test/cmp/incperl.htm
test/cmp/syntax.htm
test/cmp/asp.htm
+test/cmp/subtab.htm
Changes.pod
Embperl.pm
Embperl.xs
1.1.2.9 +19 -16 embperl/Attic/MANIFEST.2
Index: MANIFEST.2
===================================================================
RCS file: /home/cvs/embperl/Attic/MANIFEST.2,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- MANIFEST.2 2001/03/29 05:28:42 1.1.2.8
+++ MANIFEST.2 2001/04/16 18:32:29 1.1.2.9
@@ -9,10 +9,10 @@
Embperl/Syntax/EmbperlHTML.pm
Embperl/Syntax/EmbperlBlocks.pm
Embperl/Syntax/Embperl.pm
-Embperl/Syntax/SSI.pm
-Embperl/Syntax/ASP.pm
-Embperl/Syntax/Text.pm
-Embperl/Syntax/Perl.pm
+Embperl/Syntax/SSI.pm
+Embperl/Syntax/ASP.pm
+Embperl/Syntax/Text.pm
+Embperl/Syntax/Perl.pm
Embperl/Syntax/Mail.pm
README.v2
test/cmp2/errdoc2.htm
@@ -32,9 +32,9 @@
test/cmp2/importsub.htm
test/cmp2/importsub2.htm
test/cmp2/importmodule.htm
-test/cmp2/epodiv.htm
-test/cmp2/epoincdiv.htm
-test/cmp2/epobless2.htm
+test/cmp2/epodiv.htm
+test/cmp2/epoincdiv.htm
+test/cmp2/epobless2.htm
test/cmp2/varerr.htm56
test/html2/error.htm
test/html2/errormismatch.htm
@@ -42,21 +42,24 @@
test/html/rawinput/include.htm
test/html/executesub.htm
test/html/subexec.htm
-test/html/incif.htm
-test/html/inctext.htm
-test/html/incperl.htm
-test/html/syntax.htm
+test/html/incif.htm
+test/html/inctext.htm
+test/html/incperl.htm
+test/html/syntax.htm
test/html/asp.htm
test/html/SSI/ssibase.htm
test/html/SSI/ssiinc.htm
-test/html/SSIEP/ssiep.htm
+test/html/SSIEP/ssiep.htm
test/html/registry/script.pl
+test/html/subtab.htm
test/cmp/incif.htm
test/cmp/executesub.htm
test/cmp/ssibase.htm
test/cmp/ssiinc.htm
test/cmp/ssiep.htm
-test/cmp/inctext.htm
-test/cmp/incperl.htm
-test/cmp/syntax.htm
-test/cmp/asp.htm
+test/cmp/inctext.htm
+test/cmp/incperl.htm
+test/cmp/syntax.htm
+test/cmp/asp.htm
+test/cmp/subtab.htm
+
1.4.2.45 +5 -3 embperl/Attic/epcomp.c
Index: epcomp.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcomp.c,v
retrieving revision 1.4.2.44
retrieving revision 1.4.2.45
diff -u -r1.4.2.44 -r1.4.2.45
--- epcomp.c 2001/04/10 11:02:35 1.4.2.44
+++ epcomp.c 2001/04/16 18:32:29 1.4.2.45
@@ -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.44 2001/04/10 11:02:35 richter Exp $
+# $Id: epcomp.c,v 1.4.2.45 2001/04/16 18:32:29 richter Exp $
#
###################################################################################*/
@@ -37,6 +37,7 @@
int bCompileChilds ;
int nNodeType ;
int nSwitchCodeType ;
+ int bCallReturn ;
const char * sMayJump ;
struct tEmbperlCmd * pNext ;
} ;
@@ -216,6 +217,7 @@
pCmd -> bPerlCodeRemove = GetHashValueInt (pHash, "perlcoderemove", 0) ;
pCmd -> bCompileChilds = GetHashValueInt (pHash, "compilechilds", 1) ;
pCmd -> nSwitchCodeType = GetHashValueInt (pHash, "switchcodetype", 0) ;
+ pCmd -> bCallReturn = GetHashValueInt (pHash, "callreturn", 0) ;
pCmd -> nNodeType = nNodeType ;
pCmd -> pNext = NULL ;
@@ -1001,8 +1003,8 @@
lprintf (pCurrReq, "[%d]EPCOMP: #%d L%d Set Checkpoint pending\n",
pCurrReq -> nPid, pNode -> xNdx, pNode -> nLinenumber) ;
}
- if (pCmd -> bRemoveNode & 64)
- pNode -> bFlags |= nflgIgnoreChilds ;
+ if (pCmd -> bCallReturn)
+ pNode -> bFlags |= nflgSubCheckpoint ;
if (pCmd -> bRemoveNode & 1)
pNode -> bFlags = 0 ;
1.4.2.30 +4 -4 embperl/Attic/epdom.c
Index: epdom.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.c,v
retrieving revision 1.4.2.29
retrieving revision 1.4.2.30
diff -u -r1.4.2.29 -r1.4.2.30
--- epdom.c 2001/04/10 08:03:44 1.4.2.29
+++ epdom.c 2001/04/16 18:32:29 1.4.2.30
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epdom.c,v 1.4.2.29 2001/04/10 08:03:44 richter Exp $
+# $Id: epdom.c,v 1.4.2.30 2001/04/16 18:32:29 richter Exp $
#
###################################################################################*/
@@ -2143,7 +2143,7 @@
pSavedNode = NULL ;
pNewNode = Node_self (pDomTree, xNextNode) ;
pNewParent = Node_selfParentNode (pDomTree, pNewNode) ;
- if (pParent = pLastStartTag)
+ if ((pNode -> bFlags & nflgSubCheckpoint) == 0 && (pNewNode -> bFlags
& nflgSubCheckpoint) == 0 && (pParent = pLastStartTag))
{
while (pNewParent != pParent)
{
@@ -2172,7 +2172,7 @@
tDomTreeOrder * pOrder = pDomTree -> pOrder ;
int n = ArrayGetSize (pOrder) ;
int i = nOrderNdx ;
- lprintf (r, "[%d]toString: %d = %d -> %d max = %d\n", r -> nPid, i,
pOrder[i].xFromNode, pOrder[i].xToNode, n-1) ;
+ lprintf (r, "[%d]toString: %d = %d -> %d max = %d\n", r -> nPid, i,
pOrder[i].xFromNode, pOrder[i].xToNode, n-1) ;
while (pOrder[i].xFromNode != pNode -> xNdx && i < n)
i++ ;
@@ -2290,7 +2290,7 @@
if (nOrderNdx == nOrderIndexNode)
nOrderNdx++ ;
- if (pNode -> nType == ntypDocumentFraq || (pNode -> bFlags & nflgIgnoreChilds))
+ if (pNode -> nType == ntypDocumentFraq)
pNextNode = NULL ;
else
pNextNode = Node_selfFirstChild (pDomTree, pNode) ;
1.4.2.14 +2 -2 embperl/Attic/epdom.h
Index: epdom.h
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.h,v
retrieving revision 1.4.2.13
retrieving revision 1.4.2.14
diff -u -r1.4.2.13 -r1.4.2.14
--- epdom.h 2001/03/28 12:58:20 1.4.2.13
+++ epdom.h 2001/04/16 18:32:30 1.4.2.14
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epdom.h,v 1.4.2.13 2001/03/28 12:58:20 richter Exp $
+# $Id: epdom.h,v 1.4.2.14 2001/04/16 18:32:30 richter Exp $
#
###################################################################################*/
@@ -136,7 +136,7 @@
nflgModified = 16,
nflgCheckpoint = 32,
nflgReturn = 64,
- nflgIgnoreChilds= 128,
+ nflgSubCheckpoint= 128,
} ;
enum tAttrFlags
No revision
No revision
1.1.2.14 +3 -1 embperl/Embperl/Syntax/Attic/EmbperlBlocks.pm
Index: EmbperlBlocks.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/EmbperlBlocks.pm,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- EmbperlBlocks.pm 2001/04/10 11:02:39 1.1.2.13
+++ EmbperlBlocks.pm 2001/04/16 18:32:31 1.1.2.14
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: EmbperlBlocks.pm,v 1.1.2.13 2001/04/10 11:02:39 richter Exp $
+# $Id: EmbperlBlocks.pm,v 1.1.2.14 2001/04/16 18:32:31 richter Exp $
#
###################################################################################
@@ -326,6 +326,7 @@
stackname2 => 'subname',
push2 => '%&<noname>%',
switchcodetype => 2,
+ callreturn => 1,
},
{
perlcode => '}; sub %^subname% { my @_ep_save ;
HTML::Embperl::Cmd::SubStart($_ep_DomTree,%$q%,\\@_ep_save); my $_ep_ret =
_ep_sub_%^subname% (@_); HTML::Embperl::Cmd::SubEnd($_ep_DomTree,\\@_ep_save); return
$_ep_ret } ; $_[0] -> ExportHash -> {%^"subname%} = \&%^subname% ; ',
@@ -333,6 +334,7 @@
mayjump => 1,
pop2 => 'subname',
switchcodetype => 1,
+ callreturn => 1,
}) ;
}
No revision
No revision
1.1.2.1 +32 -0 embperl/test/cmp/Attic/subtab.htm
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
