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/05/04 08:08:21 UTC
cvs commit: embperl/test/html hidden.htm java.htm
richter 01/05/03 23:08:21
Modified: . Tag: Embperl2c Changes.pod epcmd2.c epparse.c
test.pl
Embperl/Syntax Tag: Embperl2c HTML.pm
test/cmp Tag: Embperl2c hidden.htm java.htm
test/cmp2 Tag: Embperl2c hidden.htm
test/html Tag: Embperl2c hidden.htm java.htm
Log:
Embperl 2 - fix hidden in loop and detected of end of html tags
Revision Changes Path
No revision
No revision
1.129.4.19 +3 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.129.4.18
retrieving revision 1.129.4.19
diff -u -r1.129.4.18 -r1.129.4.19
--- Changes.pod 2001/05/02 12:14:13 1.129.4.18
+++ Changes.pod 2001/05/04 06:08:10 1.129.4.19
@@ -24,6 +24,9 @@
- Embperl doesn't insert a linefeed after an Execute anymore.
- Embperl now keeps single or double quote the same as in the source
file. Requested by Jonny Cavell.
+ - [$hidden$] works now correctly inside of loops. Spotted by Jonny Cavell.
+ - The parser now checks for the correct end of an html tag. Spotted
+ by Jonny Cavell.
=head1 2.0b2 (BETA) 29. Mar 2001
1.4.2.8 +21 -4 embperl/Attic/epcmd2.c
Index: epcmd2.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcmd2.c,v
retrieving revision 1.4.2.7
retrieving revision 1.4.2.8
diff -u -r1.4.2.7 -r1.4.2.8
--- epcmd2.c 2001/04/26 13:12:48 1.4.2.7
+++ epcmd2.c 2001/05/04 06:08:11 1.4.2.8
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epcmd2.c,v 1.4.2.7 2001/04/26 13:12:48 richter Exp $
+# $Id: epcmd2.c,v 1.4.2.8 2001/05/04 06:08:11 richter Exp $
#
###################################################################################*/
@@ -183,10 +183,27 @@
char sVar[512] ;
int nMax ;
STRLEN nKey ;
+ tNodeData * pNode ;
+ tNodeData * pNewNode ;
+
EPENTRY (CmdHidden) ;
+
+ Node_selfCondCloneNode (pDomTree, Node_self (pDomTree, xNode)) ;
+ pNode = Node_self (pDomTree, xNode) ;
+
+ if ((pNode -> bFlags & nflgModified))
+ {
+ pNode -> bFlags |= nflgReturn | nflgModified ;
+ pNewNode = Node_selfCloneNode (pDomTree, pNode, 0) ;
+ }
+ else
+ pNewNode = pNode ;
+
+ pNewNode -> bFlags |= nflgReturn | nflgModified ;
+
+ DomTree_selfCheckpoint (pDomTree, pNode -> xNdx, pNewNode -> xNdx) ;
-
sArgs = _ep_strdup (r, sArg) ;
if (sArgs && *sArgs != '\0')
{
@@ -263,7 +280,7 @@
{
char * s ;
STRLEN l ;
- tNode xInputNode = Node_appendChild (pDomTree, ntypTag, 0, "input", 5, xNode, 0, 0) ;
+ tNode xInputNode = Node_appendChild (pDomTree, ntypTag, 0, "input", 5, pNewNode -> xNdx, 0, 0) ;
tNode xAttr = Node_appendChild (pDomTree, ntypAttr, 0, "type", 4, xInputNode, 0, 0) ;
Node_appendChild (pDomTree, ntypAttrValue, 0, "hidden", 6, xAttr, 0, 0) ;
@@ -295,7 +312,7 @@
{
char * s ;
STRLEN l ;
- tNode xInputNode = Node_appendChild (pDomTree, ntypTag, 0, "input", 5, xNode, 0, 0) ;
+ tNode xInputNode = Node_appendChild (pDomTree, ntypTag, 0, "input", 5, pNewNode -> xNdx, 0, 0) ;
tNode xAttr = Node_appendChild (pDomTree, ntypAttr, 0, "type", 4, xInputNode, 0, 0) ;
Node_appendChild (pDomTree, ntypAttrValue, 0, "hidden", 6, xAttr, 0, 0) ;
1.4.2.21 +15 -2 embperl/Attic/epparse.c
Index: epparse.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epparse.c,v
retrieving revision 1.4.2.20
retrieving revision 1.4.2.21
diff -u -r1.4.2.20 -r1.4.2.21
--- epparse.c 2001/05/02 14:35:16 1.4.2.20
+++ epparse.c 2001/05/04 06:08:11 1.4.2.21
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epparse.c,v 1.4.2.20 2001/05/02 14:35:16 richter Exp $
+# $Id: epparse.c,v 1.4.2.21 2001/05/04 06:08:11 richter Exp $
#
###################################################################################*/
@@ -273,6 +273,17 @@
{
pTokenTable -> bLSearch = SvIV ((SV *)pToken) ;
}
+ else if (strcmp (pKey, "-contains") == 0)
+ {
+ STRLEN l ;
+ char * c = SvPV (pToken, l) ;
+ while (*c)
+ {
+ pAllChars [tolower(*c) >> 3] |= 1 << (tolower(*c) & 7) ;
+ pAllChars [toupper(*c) >> 3] |= 1 << (toupper(*c) & 7) ;
+ c++ ;
+ }
+ }
}
else
{
@@ -567,7 +578,9 @@
if (pToken -> nTextLen == 0)
continue ;
r = strnicmp (pCurr, pToken -> sText, pToken -> nTextLen) ;
- if (r == 0 || *pCurr > *(pToken -> sText))
+ //if ((r == 0 && !(pAllChars [pCurr[pToken -> nTextLen] >> 3] & (1 << (pCurr[pToken -> nTextLen] & 7)))) ||
+ if (r == 0 ||
+ *pCurr > *(pToken -> sText))
break ;
}
if (r != 0)
1.70.4.52 +5 -5 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.51
retrieving revision 1.70.4.52
diff -u -r1.70.4.51 -r1.70.4.52
--- test.pl 2001/05/02 14:35:17 1.70.4.51
+++ test.pl 2001/05/04 06:08:12 1.70.4.52
@@ -11,7 +11,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: test.pl,v 1.70.4.51 2001/05/02 14:35:17 richter Exp $
+# $Id: test.pl,v 1.70.4.52 2001/05/04 06:08:12 richter Exp $
#
###################################################################################
@@ -573,10 +573,10 @@
'version' => 2,
'repeat' => 2,
},
- 'rtf/rtfbasic.asc' => {
- 'version' => 2,
- 'syntax' => 'RTF',
- },
+# 'rtf/rtfbasic.asc' => {
+# 'version' => 2,
+# 'syntax' => 'RTF',
+# },
) ;
for ($i = 0 ; $i < @testdata; $i += 2)
No revision
No revision
1.1.2.13 +3 -1 embperl/Embperl/Syntax/Attic/HTML.pm
Index: HTML.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/HTML.pm,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- HTML.pm 2001/05/02 12:14:15 1.1.2.12
+++ HTML.pm 2001/05/04 06:08:14 1.1.2.13
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: HTML.pm,v 1.1.2.12 2001/05/02 12:14:15 richter Exp $
+# $Id: HTML.pm,v 1.1.2.13 2001/05/04 06:08:14 richter Exp $
#
###################################################################################
@@ -74,6 +74,8 @@
die "'$tagtype' unknown" if (!($ttref = $self -> {-root}{$tagtype})) ;
my $ttfollow = ($ttref -> {'follow'} ||= {}) ;
+ $ttref -> {'follow'}{-contains} = 'abcdefghijklmnopqrstuvwxyz0123456789_' ;
+
my $tag = $ttfollow -> {$tagname} = {
'text' => $tagname,
'unescape' => 1,
No revision
No revision
1.4.6.1 +13 -0 embperl/test/cmp/hidden.htm
Index: hidden.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/hidden.htm,v
retrieving revision 1.4
retrieving revision 1.4.6.1
diff -u -r1.4 -r1.4.6.1
--- hidden.htm 1999/10/05 06:02:07 1.4
+++ hidden.htm 2001/05/04 06:08:17 1.4.6.1
@@ -91,6 +91,19 @@
<input type="hidden" name="empty2" value="">
</form>
+
+<form>
+ l1<input type="hidden" name="empty1" value=""><input type="hidden" name="empty2" value="">
+</form>
+<form>
+ l1<input type="hidden" name="empty1" value=""><input type="hidden" name="empty2" value="">
+</form>
+<form>
+ l1<input type="hidden" name="empty1" value=""><input type="hidden" name="empty2" value="">
+</form>
+<form>
+ l1<input type="hidden" name="empty1" value=""><input type="hidden" name="empty2" value="">
+</form>
</body>
</html>
1.3.6.1 +7 -0 embperl/test/cmp/java.htm
Index: java.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/java.htm,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -r1.3 -r1.3.6.1
--- java.htm 1999/10/05 06:02:13 1.3
+++ java.htm 2001/05/04 06:08:17 1.3.6.1
@@ -19,5 +19,12 @@
window.alert(result);
};
</script>
+
+
+ <script>
+ for (var j = 0; j < select2loc[i].length; j++){ }
+ </script>
+
+
</html>
No revision
No revision
1.1.2.2 +13 -0 embperl/test/cmp2/Attic/hidden.htm
Index: hidden.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp2/Attic/hidden.htm,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- hidden.htm 2000/09/13 19:17:29 1.1.2.1
+++ hidden.htm 2001/05/04 06:08:18 1.1.2.2
@@ -57,5 +57,18 @@
</form>
+
+<form>
+ l1<input type="hidden" name="empty1" value=""><input type="hidden" name="empty2" value="">
+</form>
+<form>
+ l1<input type="hidden" name="empty1" value=""><input type="hidden" name="empty2" value="">
+</form>
+<form>
+ l1<input type="hidden" name="empty1" value=""><input type="hidden" name="empty2" value="">
+</form>
+<form>
+ l1<input type="hidden" name="empty1" value=""><input type="hidden" name="empty2" value="">
+</form>
</body>
</html>
No revision
No revision
1.3.6.1 +9 -0 embperl/test/html/hidden.htm
Index: hidden.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/hidden.htm,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -r1.3 -r1.3.6.1
--- hidden.htm 1999/10/05 06:03:42 1.3
+++ hidden.htm 2001/05/04 06:08:19 1.3.6.1
@@ -78,5 +78,14 @@
</form>
+
+[$foreach $i (1..4)$]
+<form>
+ l1[$hidden $]
+</form>
+[$endforeach$]
+
+
+
</body>
</html>
1.1.2.1.6.1 +7 -0 embperl/test/html/java.htm
Index: java.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/java.htm,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.6.1
diff -u -r1.1.2.1 -r1.1.2.1.6.1
--- java.htm 1998/07/14 20:11:20 1.1.2.1
+++ java.htm 2001/05/04 06:08:20 1.1.2.1.6.1
@@ -20,4 +20,11 @@
window.alert(result);
};
</script>
+
+
+ <script>
+ for (var j = 0; j < select2loc[i].length; j++){ }
+ </script>
+
+
</html>
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org