Update of /cvsroot/plib/plib/src/psl
In directory usw-pr-cvs1:/tmp/cvs-serv6828
Modified Files:
psl.h pslCompiler.h pslContext.h pslProgram.cxx
Log Message:
Const-correctness, again
Index: psl.h
===================================================================
RCS file: /cvsroot/plib/plib/src/psl/psl.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- psl.h 7 Sep 2002 23:05:06 -0000 1.11
+++ psl.h 8 Sep 2002 00:37:44 -0000 1.12
@@ -22,7 +22,7 @@
*/
-#include <stdio.h>
+#include "ul.h"
enum pslResult
{
@@ -133,8 +133,7 @@
virtual void set ( float v ) { t = PSL_FLOAT ; f = v ; }
virtual void set ( const char *v ) { t = PSL_STRING ;
delete [] s ;
- s = new char [ strlen(v)+1 ] ;
- strcpy ( s, v ) ; }
+ s = ulStrDup ( v ) ; }
virtual void set ( const pslNumber *v )
{
@@ -189,8 +188,7 @@
case PSL_INT : i = atoi ( v ) ; return ;
case PSL_FLOAT : f = atof ( v ) ; return ;
case PSL_STRING : delete [] s ;
- s = new char [ strlen(v)+1 ] ;
- strcpy ( s, v ) ;
+ s = ulStrDup ( v ) ;
return ;
case PSL_VOID : return ;
}
@@ -232,8 +230,8 @@
public:
- pslProgram ( pslExtension *ext, char *_progName = NULL ) ;
- pslProgram ( pslProgram *src, char *_progName = NULL ) ;
+ pslProgram ( pslExtension *ext, const char *_progName = NULL ) ;
+ pslProgram ( pslProgram *src, const char *_progName = NULL ) ;
~pslProgram () ;
@@ -247,12 +245,11 @@
void setProgName ( const char *nm )
{
delete [] progName ;
- progName = new char [ strlen ( nm ) + 1 ] ;
- strcpy ( progName, nm ) ;
+ progName = ulStrDup ( nm ) ;
}
void *getUserData () const { return userData ; }
- void setUserData ( void *ud ) { userData = ud ; }
+ void setUserData ( void *ud ) { userData = ud ; }
void dump () const ;
int compile ( const char *fname ) ;
Index: pslCompiler.h
===================================================================
RCS file: /cvsroot/plib/plib/src/psl/pslCompiler.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pslCompiler.h 7 Sep 2002 23:05:06 -0000 1.6
+++ pslCompiler.h 8 Sep 2002 00:37:44 -0000 1.7
@@ -48,7 +48,7 @@
{
int line_no ;
- int getLineNo () { return line_no ; }
+ int getLineNo () const { return line_no ; }
int getChar ( FILE *fd ) ;
int unGetChar ( int c, FILE *fd ) ;
@@ -141,7 +141,7 @@
char *progName ;
- const char *getProgName () { return progName ; }
+ const char *getProgName () const { return progName ; }
void error ( const char *fmt, ... ) ;
void warning ( const char *fmt, ... ) ;
@@ -198,8 +198,7 @@
pslCompiler ( pslOpcode *_code, pslExtension *_extn, const char *_progName )
{
- progName = new char [ strlen ( _progName ) + 1 ] ;
- strcpy ( progName, _progName ) ;
+ progName = ulStrDup ( _progName ) ;
code = _code ;
extensions = _extn ;
Index: pslContext.h
===================================================================
RCS file: /cvsroot/plib/plib/src/psl/pslContext.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pslContext.h 7 Sep 2002 23:05:06 -0000 1.5
+++ pslContext.h 8 Sep 2002 00:37:44 -0000 1.6
@@ -39,7 +39,7 @@
void bumpErrors () { num_errors++ ; }
void bumpWarnings () { num_warnings++ ; }
- const char *getProgName () { return program -> getProgName () ; }
+ const char *getProgName () const { return program -> getProgName () ; }
void error ( const char *fmt, ... ) ;
void warning ( const char *fmt, ... ) ;
Index: pslProgram.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/psl/pslProgram.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- pslProgram.cxx 7 Sep 2002 23:05:06 -0000 1.8
+++ pslProgram.cxx 8 Sep 2002 00:37:45 -0000 1.9
@@ -24,7 +24,7 @@
#include "pslLocal.h"
-pslProgram::pslProgram ( pslExtension *ext, char *_prgnm )
+pslProgram::pslProgram ( pslExtension *ext, const char *_prgnm )
{
if ( ! _pslInitialised )
ulSetError ( UL_FATAL,
@@ -48,7 +48,7 @@
}
-pslProgram::pslProgram ( pslProgram *src, char *_prgnm )
+pslProgram::pslProgram ( pslProgram *src, const char *_prgnm )
{
progName = NULL ;
|
