richter     00/05/02 07:28:20

  Modified:    .        Tag: Embperl2 Embperl.pm Makefile.PL embperl.h
                        epmain.c test.pl
  Added:       .        Tag: Embperl2 epparse.c
  Log:
  start parserer for Embperl 2
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.104.2.1 +3 -1      embperl/Embperl.pm
  
  Index: Embperl.pm
  ===================================================================
  RCS file: /home/cvs/embperl/Embperl.pm,v
  retrieving revision 1.104
  retrieving revision 1.104.2.1
  diff -u -r1.104 -r1.104.2.1
  --- Embperl.pm        2000/05/02 06:43:26     1.104
  +++ Embperl.pm        2000/05/02 14:28:19     1.104.2.1
  @@ -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.104 2000/05/02 06:43:26 richter Exp $
  +#   $Id: Embperl.pm,v 1.104.2.1 2000/05/02 14:28:19 richter Exp $
   #
   ###################################################################################
   
  @@ -23,6 +23,8 @@
   
   require Exporter;
   require DynaLoader;
  +
  +use HTML::Embperl::Tokens ;
   
   use strict ;
   use vars qw(
  
  
  
  1.28.2.1  +1 -1      embperl/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/embperl/Makefile.PL,v
  retrieving revision 1.28
  retrieving revision 1.28.2.1
  diff -u -r1.28 -r1.28.2.1
  --- Makefile.PL       2000/04/22 20:18:02     1.28
  +++ Makefile.PL       2000/05/02 14:28:19     1.28.2.1
  @@ -812,7 +812,7 @@
   WriteMakefile(
       'NAME'      => 'HTML::Embperl',
       'VERSION_FROM' => 'Embperl.pm',          # finds $VERSION
  -    'OBJECT'     => 'Embperl$(OBJ_EXT) epmain$(OBJ_EXT) epio$(OBJ_EXT) 
epchar$(OBJ_EXT) epcmd$(OBJ_EXT) eputil$(OBJ_EXT) epeval$(OBJ_EXT) epdbg$(OBJ_EXT)' . 
$o,
  +    'OBJECT'     => 'Embperl$(OBJ_EXT) epmain$(OBJ_EXT) epio$(OBJ_EXT) 
epchar$(OBJ_EXT) epcmd$(OBJ_EXT) eputil$(OBJ_EXT) epeval$(OBJ_EXT) epdbg$(OBJ_EXT) 
epparse$(OBJ_EXT)' . $o,
       'LIBS'      => [''],                      
       'DEFINE'    => "$d \$(DEFS)",                     
       'INC'       => $i,                        
  
  
  
  1.17.2.1  +3 -2      embperl/embperl.h
  
  Index: embperl.h
  ===================================================================
  RCS file: /home/cvs/embperl/embperl.h,v
  retrieving revision 1.17
  retrieving revision 1.17.2.1
  diff -u -r1.17 -r1.17.2.1
  --- embperl.h 2000/05/02 04:41:37     1.17
  +++ embperl.h 2000/05/02 14:28:19     1.17.2.1
  @@ -67,8 +67,8 @@
       rcCGIError,
       rcUnclosedHtml,
       rcUnclosedCmd,
  -    rcNotAllowed
  -    
  +    rcNotAllowed,
  +    rcNotHashRef
       } ;
   
   
  @@ -101,6 +101,7 @@
       dbgProfile          = 0x100000,
       dbgSession          = 0x200000,
       dbgImport                = 0x400000,
  +    dbgBuildToken   = 0x800000,
       
       dbgAll  = -1
       } ;
  
  
  
  1.65.2.1  +4 -1      embperl/epmain.c
  
  Index: epmain.c
  ===================================================================
  RCS file: /home/cvs/embperl/epmain.c,v
  retrieving revision 1.65
  retrieving revision 1.65.2.1
  diff -u -r1.65 -r1.65.2.1
  --- epmain.c  2000/05/02 04:41:37     1.65
  +++ epmain.c  2000/05/02 14:28:19     1.65.2.1
  @@ -131,6 +131,7 @@
           case rcUnclosedHtml:            msg ="[%d]ERR:  %d: Line %d: Unclosed HTML 
tag <%s> at end of file %s" ; break ;
           case rcUnclosedCmd:             msg ="[%d]ERR:  %d: Line %d: Unclosed 
command [$ %s $] at end of file %s" ; break ;
        case rcNotAllowed:              msg ="[%d]ERR:  %d: Line %d: Forbidden %s: 
Does not match EMBPERL_ALLOW %s" ; break ;
  +        case rcNotHashRef:              msg ="[%d]ERR:  %d: Line %d: %s need 
hashref in %s" ; break ; 
           default:                        msg ="[%d]ERR:  %d: Line %d: Error %s%s" ; 
break ; 
           }
   
  @@ -2496,7 +2497,9 @@
       r -> Buf.pSourcelinePos = r -> Buf.pCurrPos = r -> Buf.pBuf ;
       r -> Buf.pEndPos  = r -> Buf.pBuf + nFileSize ;
   
  -    rc = EvalMain (r) ; 
  +    rc = ParseFile (r) ;
  +
  +    // rc = EvalMain (r) ; 
   
       if ((r -> bOptions & optNoUncloseWarn) == 0)
        {
  
  
  
  1.57.2.1  +2 -2      embperl/test.pl
  
  Index: test.pl
  ===================================================================
  RCS file: /home/cvs/embperl/test.pl,v
  retrieving revision 1.57
  retrieving revision 1.57.2.1
  diff -u -r1.57 -r1.57.2.1
  --- test.pl   2000/04/17 21:03:15     1.57
  +++ test.pl   2000/05/02 14:28:19     1.57.2.1
  @@ -4,7 +4,7 @@
   
   
   @tests = (
  -    'ascii',
  +#    'ascii',
       'pure.htm',
       'plain.htm',
       'plain.htm',
  @@ -206,7 +206,7 @@
   $port    = $EPPORT ;
   $host    = 'localhost' ;
   $httpdpid = 0 ;
  -$defaultdebug = 0x785ffd ;
  +$defaultdebug = 0xf85ffd ;
   
   
   if ($cmdarg =~ /\?/)
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +260 -0    embperl/Attic/epparse.c
  
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to