perl-embperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rich...@locus.apache.org
Subject cvs commit: embperl/test/html if.htm loop.htm
Date Wed, 24 May 2000 21:08:43 GMT
richter     00/05/24 14:08:38

  Modified:    .        Tag: Embperl2 TODO epcomp.c test.pl
               Embperl  Tag: Embperl2 Syntax.pm
               test/cmp Tag: Embperl2 if.htm loop.htm
               test/html Tag: Embperl2 if.htm loop.htm
  Log:
  Embperl 2 - Loops
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.90.2.1  +11 -0     embperl/TODO
  
  Index: TODO
  ===================================================================
  RCS file: /home/cvs/embperl/TODO,v
  retrieving revision 1.90
  retrieving revision 1.90.2.1
  diff -u -r1.90 -r1.90.2.1
  --- TODO	2000/04/13 21:36:53	1.90
  +++ TODO	2000/05/24 21:08:16	1.90.2.1
  @@ -119,3 +119,14 @@
   __
   
   - Parse Posted XML data [Alex Schmelkin 4.2.2000]
  +
  +----------------
  +
  +- $optRawInput etc.
  +
  +- blank lines after endif -> if.htm
  +
  +- [$<br>if ... -> if.htm
  +
  +- <body [$if ... endif$]>  -> tagscan.htm
  +
  
  
  
  1.1.2.14  +5 -3      embperl/Attic/epcomp.c
  
  Index: epcomp.c
  ===================================================================
  RCS file: /home/cvs/embperl/Attic/epcomp.c,v
  retrieving revision 1.1.2.13
  retrieving revision 1.1.2.14
  diff -u -r1.1.2.13 -r1.1.2.14
  --- epcomp.c	2000/05/24 14:33:25	1.1.2.13
  +++ epcomp.c	2000/05/24 21:08:17	1.1.2.14
  @@ -197,11 +197,11 @@
   		    else
   			pAttr = Element_selfGetAttribut (pDomTree, pNode, p + 1, q - p - 1) ;
   		    
  -                    if (!pAttr)
  +                    if (!pAttr || pAttr -> xValue == 0)
   			sVal = NULL ;
   		    else if (pAttr -> bFlags & aflgAttrValue)
                           sVal = Ndx2String (pAttr -> xValue) ;
  -                    else
  +                    else 
                           sVal = Node_selfNodeName (Node_selfFirstChild (pDomTree, (tNodeData
*)pAttr)) ;
   
   		    if (sVal)
  @@ -298,7 +298,9 @@
   
               if (pCmd -> bRemoveNode & 6)
   	        {
  -	        tNodeData *  pNextNode    = Node_selfNextSibling (pDomTree, pNode) ;
  +	        tNodeData *  pNextNode    = Node_selfFirstChild (pDomTree, pNode) ;
  +	        if (pNextNode == NULL || (pNextNode -> nType != ntypText && pNextNode
-> nType != ntypCDATA))
  +		    pNextNode    = Node_selfNextSibling (pDomTree, pNode) ;
   		if (pNextNode)
   		    {
   		    const char * sText        = Node_selfNodeName (pNextNode) ;
  
  
  
  1.57.2.12 +1 -1      embperl/test.pl
  
  Index: test.pl
  ===================================================================
  RCS file: /home/cvs/embperl/test.pl,v
  retrieving revision 1.57.2.11
  retrieving revision 1.57.2.12
  diff -u -r1.57.2.11 -r1.57.2.12
  --- test.pl	2000/05/24 14:33:26	1.57.2.11
  +++ test.pl	2000/05/24 21:08:18	1.57.2.12
  @@ -36,7 +36,7 @@
   ##    'ifperl.htm',
       'loop.htm?erstes=Hallo&zweites=Leer+zeichen&drittes=%21%22%23%2a%2B&erstes=Wert2',
       'loop.htm?erstes=Hallo&zweites=Leer+zeichen&drittes=%21%22%23%2a%2B&erstes=Wert2',
  -    'loopperl.htm?erstes=Hallo&zweites=Leer+zeichen&drittes=%21%22%23&erstes=Wert2',
  +##    'loopperl.htm?erstes=Hallo&zweites=Leer+zeichen&drittes=%21%22%23&erstes=Wert2',
       'table.htm',
       'table.htm??1',
       'lists.htm?sel=2&SEL1=B&SEL3=D&SEL4=cc',
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.8   +13 -3     embperl/Embperl/Attic/Syntax.pm
  
  Index: Syntax.pm
  ===================================================================
  RCS file: /home/cvs/embperl/Embperl/Attic/Syntax.pm,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- Syntax.pm	2000/05/24 14:33:31	1.1.2.7
  +++ Syntax.pm	2000/05/24 21:08:27	1.1.2.8
  @@ -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.2.7 2000/05/24 14:33:31 richter Exp $
  +#   $Id: Syntax.pm,v 1.1.2.8 2000/05/24 21:08:27 richter Exp $
   #
   ###################################################################################
   
  @@ -103,7 +103,7 @@
           'unescape' => 1,
           'procinfo' => {
               embperl => { 
  -                        perlcode    => '%#0%;',
  +                        perlcode    => '%#0%',
                           removenode  => 3,
                           mayjump     => 1,
                           },
  @@ -461,7 +461,17 @@
       ) ;
   
   
  -
  +%MetaCmdsDropTag = (
  +    'br' => {
  +        'text' => '<br>',
  +        'follow' => \%MetaCmds,
  +        },
  +    'p' => {
  +        'text' => '<p>',
  +        'follow' => \%MetaCmds,
  +        },
  +    %MetaCmds,
  +    ) ;
   
   
   %Default = (
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.1   +64 -12    embperl/test/cmp/if.htm
  
  Index: if.htm
  ===================================================================
  RCS file: /home/cvs/embperl/test/cmp/if.htm,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- if.htm	1999/10/05 06:02:08	1.4
  +++ if.htm	2000/05/24 21:08:29	1.4.2.1
  @@ -8,37 +8,90 @@
   
   a1
   a <br>
  +
  +
   a2
   a <br>
  +
  +
   a3
  -a <br>
  -a4
   a <br>
  +    a4
   a5
   a <br>
       b is null <br>
  -    a <br>
  +    
  +
  +
  +
  +a <br>
       b is null <br>
  -    a<br>
  +    
  +
  +
  +
  +a<br>
       b is null <br>
  -    a <br>
  +    
  +
  +
  +
  +a <br>
       b is null <br>
  -    a <br>
  +    
  +
  +
  +
  +a <br>
       b is null <br>
  -    a is not null <br>
  +    
  +
  +
  +
  +a is not null <br>
       b is null and c is 5 <br>
  -    a is not null <br>
  +    
  +
  +
  +
  +a is not null <br>
       b is null and c is 5 and d is 'txt' <br>
  -    a is not null <br>
  +    
  +
  +
  +
  +
  +a is not null <br>
       b is null and c is 5 and d is 'txt' <br>
           b is null and c is not 5, but d is 'txt' <br>
               If we get to here it looks good with the tests <br>
  -            a is not null <br>
  +            
  +            
  +        
  +    
  +
  +
  +
  +
  +
  +a is not null <br>
       b is null and c is 5 and d is 'txt' <br>
           b is null and c is not 5, but d is 'txt' <br>
               If we get to here it looks good with the tests <br>
  -            ttrue = true
  +            
  +            
  +        
  +    
  +
  +
  +
  +
  +ttrue = true
  +
  +
   tfalse = false
  +
  +
   The following HTML tags schould be ignored by Embperl
   
   <if 0>
  @@ -55,5 +108,4 @@
   
   </body>
   </html>
  -
   
  
  
  
  1.7.2.1   +115 -152  embperl/test/cmp/loop.htm
  
  Index: loop.htm
  ===================================================================
  RCS file: /home/cvs/embperl/test/cmp/loop.htm,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- loop.htm	1999/10/05 06:02:14	1.7
  +++ loop.htm	2000/05/24 21:08:30	1.7.2.1
  @@ -6,221 +6,184 @@
   
   <body>
   
  -erstes = Hallo	Wert2 0 <BR>
  -    
  -    zweites = Leer zeichen 0 
  -        1 <BR>
  +0
  +1
  +2
  +
  +
  +erstes = Hallo	Wert2 0 
  +    <BR>
  +    zweites = Leer zeichen 0 1 
  +    <BR>
  +    drittes = !&quot;#*+ 0 1 2 
  +    <BR>
       
  -    drittes = !&quot;#*+ 0 
  -        1 
  -        2 <BR>
  -    0
   
  -    1
   
  -    2
   A = 1<br>
  +B = 2<br>
  +C = 3<br>
   
  -    B = 2<br>
   
  -    C = 3<br>
   @a[0] = a<br>
  -	
  -    @a[1] = b<br>
  -	
  -    @a[2] = c<br>
  +	@a[1] = b<br>
  +	@a[2] = c<br>
  +	@a[3] = d<br>
   	
  -    @a[3] = d<br>
  -	@a[0] = a<br>
  -	
  -    @a[1] = b<br>
  -	
  -    @a[2] = c<br>
  +
  +@a[0] = a<br>
  +	@a[1] = b<br>
  +	@a[2] = c<br>
  +	@a[3] = d<br>
   	
  -    @a[3] = d<br>
  -	a <br>
   
  -	b <br>
  +a <br>
  +b <br>
  +c <br>
  +d <br>
   
  -	c <br>
   
  -	d <br>
   1 <br>
  +3 <br>
  +5 <br>
  +7 <br>
  +9 <br>
   
  -	3 <br>
   
  -	5 <br>
  -
  -	7 <br>
  -
  -	9 <br>
   1 <br>
  +2 <br>
  +3 <br>
  +4 <br>
  +5 <br>
  +6 <br>
  +7 <br>
  +8 <br>
  +9 <br>
  +10 <br>
   
  -	2 <br>
  -
  -	3 <br>
  -
  -	4 <br>
  -
  -	5 <br>
  -
  -	6 <br>
  -
  -	7 <br>
  -
  -	8 <br>
   
  -	9 <br>
  -
  -	10 <br>
   2:1 <br>
  +2:2 <br>
  +2:3 <br>
  +2:4 <br>
  +2:5 <br>
   
  -	2:2 <br>
  -
  -	2:3 <br>
  -
  -	2:4 <br>
   
  -	2:5 <br>
   @a[0] = a<br>
   	A = 1<br>
   		1 <br>
  +		3 <br>
  +		5 <br>
  +		7 <br>
  +		9 <br>
   		
  -			3 <br>
  -		
  -			5 <br>
  -		
  -			7 <br>
   		
  -			9 <br>
  -		
  -		B = 2<br>
  +	B = 2<br>
   		1 <br>
  +		3 <br>
  +		5 <br>
  +		7 <br>
  +		9 <br>
   		
  -			3 <br>
  -		
  -			5 <br>
  -		
  -			7 <br>
  -		
  -			9 <br>
   		
  -		C = 3<br>
  +	C = 3<br>
   		1 <br>
  +		3 <br>
  +		5 <br>
  +		7 <br>
  +		9 <br>
   		
  -			3 <br>
   		
  -			5 <br>
  -		
  -			7 <br>
  -		
  -			9 <br>
  -		
  -    @a[1] = b<br>
  +	
  +	@a[1] = b<br>
   	A = 1<br>
   		1 <br>
  +		3 <br>
  +		5 <br>
  +		7 <br>
  +		9 <br>
   		
  -			3 <br>
   		
  -			5 <br>
  -		
  -			7 <br>
  -		
  -			9 <br>
  -		
  -		B = 2<br>
  +	B = 2<br>
   		1 <br>
  +		3 <br>
  +		5 <br>
  +		7 <br>
  +		9 <br>
   		
  -			3 <br>
  -		
  -			5 <br>
   		
  -			7 <br>
  -		
  -			9 <br>
  -		
  -		C = 3<br>
  +	C = 3<br>
   		1 <br>
  +		3 <br>
  +		5 <br>
  +		7 <br>
  +		9 <br>
   		
  -			3 <br>
  -		
  -			5 <br>
  -		
  -			7 <br>
  -		
  -			9 <br>
   		
  -    @a[2] = c<br>
  +	
  +	@a[2] = c<br>
   	A = 1<br>
   		1 <br>
  +		3 <br>
  +		5 <br>
  +		7 <br>
  +		9 <br>
   		
  -			3 <br>
  -		
  -			5 <br>
  -		
  -			7 <br>
  -		
  -			9 <br>
   		
  -		B = 2<br>
  +	B = 2<br>
   		1 <br>
  +		3 <br>
  +		5 <br>
  +		7 <br>
  +		9 <br>
   		
  -			3 <br>
   		
  -			5 <br>
  -		
  -			7 <br>
  -		
  -			9 <br>
  -		
  -		C = 3<br>
  +	C = 3<br>
   		1 <br>
  +		3 <br>
  +		5 <br>
  +		7 <br>
  +		9 <br>
   		
  -			3 <br>
  -		
  -			5 <br>
   		
  -			7 <br>
  -		
  -			9 <br>
  -		
  -    @a[3] = d<br>
  +	
  +	@a[3] = d<br>
   	A = 1<br>
   		1 <br>
  +		3 <br>
  +		5 <br>
  +		7 <br>
  +		9 <br>
   		
  -			3 <br>
  -		
  -			5 <br>
   		
  -			7 <br>
  -		
  -			9 <br>
  -		
  -		B = 2<br>
  +	B = 2<br>
   		1 <br>
  +		3 <br>
  +		5 <br>
  +		7 <br>
  +		9 <br>
   		
  -			3 <br>
  -		
  -			5 <br>
  -		
  -			7 <br>
   		
  -			9 <br>
  -		
  -		C = 3<br>
  +	C = 3<br>
   		1 <br>
  +		3 <br>
  +		5 <br>
  +		7 <br>
  +		9 <br>
   		
  -			3 <br>
  -		
  -			5 <br>
   		
  -			7 <br>
  -		
  -			9 <br>
  -		x
  +	
  +	
  +
  +
  +x
  +
  + 
   
  - y
  +y
   
  +
  +
  +
   </body>
   </html>
  -
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +2 -1      embperl/test/html/if.htm
  
  Index: if.htm
  ===================================================================
  RCS file: /home/cvs/embperl/test/html/if.htm,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- if.htm	1999/10/05 06:03:43	1.3
  +++ if.htm	2000/05/24 21:08:33	1.3.2.1
  @@ -28,12 +28,13 @@
   [$ endif <br>$]
   
   a4
  +[#
   [$<br>if $a $]
       a <br>
   [$ <br> else<br>$]
       not a<br>
   [$ <br>endif $]
  -
  +#]
   a5
   [$ if $a$]
       a <br>
  
  
  
  1.4.2.3   +1 -1      embperl/test/html/loop.htm
  
  Index: loop.htm
  ===================================================================
  RCS file: /home/cvs/embperl/test/html/loop.htm,v
  retrieving revision 1.4.2.2
  retrieving revision 1.4.2.3
  diff -u -r1.4.2.2 -r1.4.2.3
  --- loop.htm	2000/05/23 07:05:11	1.4.2.2
  +++ loop.htm	2000/05/24 21:08:34	1.4.2.3
  @@ -67,7 +67,7 @@
   			[+ $fv +] <br>
   		[$ endforeach $]
   		[$ foreach $fv (()) $]
  -			[+ $fv +] <br>
  +			<xxxx>[+ $fv +] <br>
   			[$ while ($wv, $wk) = each (%h) $]
   				[+ "$wv = $wk" +]<br>
   			[$ endwhile $]
  
  
  

Mime
View raw message