[Plib-cvs] plib/src/psl pslCompiler.cxx,NONE,1.1 Makefile.am,1.2,1.3 pslDump.cxx,1.1,1.2 pslStatement.cxx,1.3,NONE

[Steve B. <sj...@us...>]

Update of /cvsroot/plib/plib/src/psl
In directory usw-pr-cvs1:/tmp/cvs-serv18890/plib/src/psl

Modified Files:
	Makefile.am pslDump.cxx 
Added Files:
	pslCompiler.cxx 
Removed Files:
	pslStatement.cxx 
Log Message:
Change filename to be more meaningful.


--- NEW FILE: pslCompiler.cxx ---

#include "pslLocal.h"


int PSL_Parser::pushReturnStatement ()
{
  char c [ MAX_TOKEN ] ;

  getToken ( c ) ;

  if ( c [ 0 ] == ';' )   /* Return without data == "return 0" */
  {
    ungetToken   ( c ) ;
    pushConstant ( "0.0" ) ;
  }
  else
  {
    ungetToken     ( c ) ;
    pushExpression () ;
[...392 lines suppressed...]

  if ( c [ 0 ] != '{' )
    ulSetError ( UL_WARNING,
       "PSL: Missing '{' in function '%s'", fn ) ;

  if ( ! pushCompoundStatement () )
    ulSetError ( UL_WARNING,
       "PSL: Missing '}' in function '%s'", fn ) ;

  getToken ( c ) ;

  /* If we fall off the end of the function, we still need a return value */

  pushConstant ( "0.0" ) ;
  pushReturn   () ;
  return TRUE ;
}




Index: Makefile.am
===================================================================
RCS file: /cvsroot/plib/plib/src/psl/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	5 Sep 2002 14:58:56 -0000	1.2
+++ Makefile.am	5 Sep 2002 15:40:28 -0000	1.3
@@ -6,7 +6,7 @@
 include_HEADERS = psl.h pslLocal.h
 
 libplibpsl_a_SOURCES = psl.cxx pslCodeGen.cxx pslRun.cxx \
-                       pslStatement.cxx pslSymbols.cxx pslToken.cxx \
+                       pslCompiler.cxx pslSymbols.cxx pslToken.cxx \
                        pslExpression.cxx pslProgram.cxx pslDump.cxx
 
 INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/util

Index: pslDump.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/psl/pslDump.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pslDump.cxx	5 Sep 2002 14:58:57 -0000	1.1
+++ pslDump.cxx	5 Sep 2002 15:40:28 -0000	1.2
@@ -81,7 +81,7 @@
 
       int ext  = code[i+1] ;
       int argc = code[i+2] ;
-      printf ( "\t%s %d", extensions[ext].symbol, argc ) ;
+      printf ( "\t%s,nargs=%d", extensions[ext].symbol, argc ) ;
       i += 2 ;
     }
     else

--- pslStatement.cxx DELETED ---