yy_str*() -> str*()

diff --git a/flex.skl b/flex.skl
index f97e506f09d272cb1257a182c6164c6e6f5b6208..f4d8356ee78d932676fa48f1cc50e21642da32a4 100644 (file)
--- a/flex.skl
+++ b/flex.skl
@@ -110,7 +110,7 @@ extern "C" {
        extern void *yy_flex_realloc YY_PROTO(( void *ptr, int size ));
        extern void yy_flex_free YY_PROTO(( void * ));
        extern int yywrap YY_PROTO(( void ));
-       extern void yy_strcpy YY_PROTO(( char *s1, const char *s2 ));
+       extern void yy_flex_strcpy YY_PROTO(( char *s1, const char *s2 ));
 #ifdef __cplusplus
        }
 #endif

diff --git a/flexdef.h b/flexdef.h
index bfed07e4687f37dbb28f43da4b6bdd653486ea81..c8a26f15d18716a00563556c6632f2a4c52f1487 100644 (file)
--- a/flexdef.h
+++ b/flexdef.h
@@ -609,9 +609,13 @@ void *reallocate_array PROTO((void*, int, int));
 void *yy_flex_alloc PROTO((int));
 void *yy_flex_realloc PROTO((void*, int));
 void yy_flex_free PROTO((void*));
-int yy_strcmp PROTO(( const char *s1, const char *s2 ));
-void yy_strcpy PROTO(( char *s1, const char *s2 ));
-int yy_strlen PROTO(( const char *s ));
+int yy_flex_strcmp PROTO(( const char *s1, const char *s2 ));
+void yy_flex_strcpy PROTO(( char *s1, const char *s2 ));
+int yy_flex_strlen PROTO(( const char *s ));
+
+#define strcmp yy_flex_strcmp
+#define strcpy yy_flex_strcpy
+#define strlen yy_flex_strlen
 
 #define allocate_integer_array(size) \
        (int *) allocate_array( size, sizeof( int ) )

diff --git a/gen.c b/gen.c
index 846e76f47d2ce195581002f898a42fdcced3802b..09c579db7f89b97e7b23c0a756f84dc588b850e0 100644 (file)
--- a/gen.c
+++ b/gen.c
@@ -596,9 +596,8 @@ int worry_about_NULs;
                }
 
        else
-               yy_strcpy( char_map, useecs ?
-                                       "yy_ec[YY_SC_TO_UI(*yy_cp)]" :
-                                       "YY_SC_TO_UI(*yy_cp)" );
+               strcpy( char_map, useecs ?
+                       "yy_ec[YY_SC_TO_UI(*yy_cp)]" : "YY_SC_TO_UI(*yy_cp)" );
 
        if ( worry_about_NULs && nultrans )
                {
@@ -1049,7 +1048,7 @@ void make_tables()
                indent_puts(
                "YY_FATAL_ERROR( \"token too large, exceeds YYLMAX\" ); \\" );
                indent_down();
-               indent_puts( "yy_strcpy( yytext, yytext_ptr ); \\" );
+               indent_puts( "yy_flex_strcpy( yytext, yytext_ptr ); \\" );
                }
 
        set_indent( 0 );

diff --git a/main.c b/main.c
index a448d543eccaeb021af406b81261c9c69d19428a..7fa5e6aa450c196f822688ee15e386b1ed29cbfa 100644 (file)
--- a/main.c
+++ b/main.c
@@ -260,7 +260,7 @@ int exit_status;
                if ( skelname )
                        fprintf( stderr, " -S%s", skelname );
 
-               if ( yy_strcmp( prefix, "yy" ) )
+               if ( strcmp( prefix, "yy" ) )
                        fprintf( stderr, " -P%s", prefix );
 
                putc( '\n', stderr );
@@ -394,7 +394,7 @@ char **argv;
        program_name = argv[0];
 
        if ( program_name[0] != '\0' &&
-            program_name[yy_strlen( program_name ) - 1] == '+' )
+            program_name[strlen( program_name ) - 1] == '+' )
                C_plus_plus = true;
 
        /* read flags */
@@ -696,7 +696,7 @@ char **argv;
        if ( skelname && (skelfile = fopen( skelname, "r" )) == NULL )
                lerrsf( "can't open skeleton file %s", skelname );
 
-       if ( yy_strcmp( prefix, "yy" ) )
+       if ( strcmp( prefix, "yy" ) )
                {
 #define GEN_PREFIX(name) out_str3( "#define yy%s %s%s\n", name, prefix, name );
                GEN_PREFIX( "FlexLexer" );

diff --git a/misc.c b/misc.c
index 2b513cb30793a77d27f4ed47fe6ff0d755f05a52..4bb7b61dcc39da7ae88e98f5a9cef98b57facb49 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -41,7 +41,7 @@ int otoi PROTO((Char []));
 void add_action( new_text )
 char *new_text;
        {
-       int len = yy_strlen( new_text );
+       int len = strlen( new_text );
 
        while ( len + action_index >= action_size - 10 /* slop */ )
                {
@@ -50,7 +50,7 @@ char *new_text;
                        reallocate_character_array( action_array, action_size );
                }
 
-       yy_strcpy( &action_array[action_index], new_text );
+       strcpy( &action_array[action_index], new_text );
 
        action_index += len;
        }

diff --git a/scan.l b/scan.l
index 7aa864dbb75752472201a88a5ed146dba2305847..3517dcf51fe6305449270df6c20e3a91187ba9a4 100644 (file)
--- a/scan.l
+++ b/scan.l
@@ -43,11 +43,11 @@
        return CHAR;
 
 #define RETURNNAME \
-       yy_strcpy( nmstr, yytext ); \
+       strcpy( nmstr, yytext ); \
        return NAME;
 
 #define PUT_BACK_STRING(str, start) \
-       for ( i = yy_strlen( str ) - 1; i >= start; --i ) \
+       for ( i = strlen( str ) - 1; i >= start; --i ) \
                unput((str)[i])
 
 #define CHECK_REJECT(str) \
@@ -139,7 +139,7 @@ CCL_CHAR    ([^\\\n\]]|{ESCSEQ})
 ^"%"[^sxanpekotcru{}].*        synerr( "unrecognized '%' directive" );
 
 ^{NAME}                        {
-                       yy_strcpy( nmstr, yytext );
+                       strcpy( nmstr, yytext );
                        didadef = false;
                        BEGIN(PICKUPDEF);
                        }
@@ -171,10 +171,10 @@ CCL_CHAR  ([^\\\n\]]|{ESCSEQ})
 <PICKUPDEF>{WS}                /* separates name and definition */
 
 <PICKUPDEF>{NOT_WS}.*  {
-                       yy_strcpy( (char *) nmdef, yytext );
+                       strcpy( (char *) nmdef, yytext );
 
                        /* Skip trailing whitespace. */
-                       for ( i = yy_strlen( (char *) nmdef ) - 1;
+                       for ( i = strlen( (char *) nmdef ) - 1;
                              i >= 0 && (nmdef[i] == ' ' || nmdef[i] == '\t');
                              --i )
                                ;
@@ -296,7 +296,7 @@ CCL_CHAR    ([^\\\n\]]|{ESCSEQ})
 <SECT2>"["{FIRST_CCL_CHAR}{CCL_CHAR}*  {
                        int cclval;
 
-                       yy_strcpy( nmstr, yytext );
+                       strcpy( nmstr, yytext );
 
                        /* Check to see if we've already encountered this
                         * ccl.
@@ -331,7 +331,7 @@ CCL_CHAR    ([^\\\n\]]|{ESCSEQ})
                        register Char *nmdefptr;
                        Char *ndlookup();
 
-                       yy_strcpy( nmstr, yytext + 1 );
+                       strcpy( nmstr, yytext + 1 );
                        nmstr[yyleng - 2] = '\0';  /* chop trailing brace */
 
                        if ( ! (nmdefptr = ndlookup( nmstr )) )
@@ -340,7 +340,7 @@ CCL_CHAR    ([^\\\n\]]|{ESCSEQ})
 
                        else
                                { /* push back name surrounded by ()'s */
-                               int len = yy_strlen( (char *) nmdefptr );
+                               int len = strlen( (char *) nmdefptr );
 
                                if ( lex_compat || nmdefptr[0] == '^' ||
                                     (len > 0 && nmdefptr[len - 1] == '$') )

diff --git a/sym.c b/sym.c
index 4058332d33e65729d055dc12f8d55bbcbda12f3d..745a2ccffa40011d295bd921cd85dc9963d00aa2 100644 (file)
--- a/sym.c
+++ b/sym.c
@@ -62,7 +62,7 @@ int table_size;
 
        while ( sym_entry )
                {
-               if ( ! yy_strcmp( sym, sym_entry->name ) )
+               if ( ! strcmp( sym, sym_entry->name ) )
                        { /* entry already exists */
                        return -1;
                        }
@@ -142,7 +142,7 @@ int table_size;
 
        while ( sym_entry )
                {
-               if ( ! yy_strcmp( sym, sym_entry->name ) )
+               if ( ! strcmp( sym, sym_entry->name ) )
                        return sym_entry;
                sym_entry = sym_entry->next;
                }