debian/0000755000000000000000000000000011320141046007156 5ustar debian/copyright0000644000000000000000000000145411320136643011124 0ustar This debian package was created by John Lapeyre . It was later maintained by Antti-Juhani Kaijanaho and Adrian Bunk . Current maintainer is Sam Hocevar . Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997 T. Hruz, L. Koren 1998 L. Koren Tomas Hruz and Ludovit Koren Slovak Technical University Namestie Slobody 17 812 31 Bratislava Slovak Republic emails: hruz@vm.stuba.sk, koren@vm.stuba.sk Source: ftp://www.vm.stuba.sk/pub/csgrp/packages/clif/ This package is distributed under the terms of the GPL. On Debian systems, the GNU General Public License, version 2 or later, is available in the file /usr/share/common-licenses/GPL. debian/patches/0000755000000000000000000000000011320140722010605 5ustar debian/patches/200_manpage.diff0000644000000000000000000000117011320137260013432 0ustar Index: clif-0.93/doc/clif.1 =================================================================== --- clif-0.93.orig/doc/clif.1 2010-01-03 16:58:23.000000000 +0100 +++ clif-0.93/doc/clif.1 2010-01-03 16:58:30.000000000 +0100 @@ -1,17 +1,6 @@ .\" Copyright (c) 1998, 1999, 2000 Free Software Foundation -*-Text-*- .\" See section COPYING for conditions for redistribution .\" -.\" Set up \*(lq, \*(rq if -man hasn't already set it up. -.if @@\*(lq@ \{\ -. ds lq " -. if t .ds lq `` -. if !@@\(lq@ .ds lq "\(lq -.\} -.if @@\*(rq@ \{\ -. ds rq " -. if t .ds rq '' -. if !@@\(rq@ .ds rq "\(rq -.\} .de Id .ds Rv \\$3 .ds Dt \\$4 debian/patches/series0000644000000000000000000000004511320137317012027 0ustar 100_oldpatches.diff 200_manpage.diff debian/patches/100_oldpatches.diff0000644000000000000000000021005211320133305014144 0ustar --- clif-0.93.orig/doc/clif.1 +++ clif-0.93/doc/clif.1 @@ -300,11 +300,6 @@ versions, except that this permission notice may be included in translations approved by the Free Software Foundation instead of in the original English. -.SH SOURCE -The -.B Clif -is available from ftp://www.vm.stuba.sk/pub/csgrp/packages/clif. The -online documentation http://www.vm.stuba.sk/~koren/clif.html. .SH AUTHORS See the Interpreter .B Clif --- clif-0.93.orig/utils/yy.c +++ clif-0.93/utils/yy.c @@ -17,7 +17,7 @@ int yymorfg; extern char *yysptr, yysbuf[]; int yytchar; -FILE *yyin ={stdin}, *yyout ={stdout}; +FILE *yyin, *yyout; extern int yylineno; struct yysvf { struct yywork *yystoff; @@ -131,6 +131,8 @@ int argc; char *argv[]; { + yyin = stdin; + yyout = stdout; info(argc,argv); init_incl(argc,argv); yylex(); --- clif-0.93.orig/Makefile.in +++ clif-0.93/Makefile.in @@ -30,7 +30,7 @@ YACC = @YACC@ YACCFLAGS = -dv LEX = @LEX@ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ -Wall INCLUDES = -I. -I$(srcdir) -I$(srcdir)/example X_CFLAGS = @X_CFLAGS@ X_LIBS = @X_LIBS@ -lX11 --- clif-0.93.orig/README +++ clif-0.93/README @@ -22,9 +22,9 @@ parameter passing mechanism (for details see documentation). In our development we stress on user interfaces on all levels of the -interpreter system. A user can write procedures within the Clif -specification, he can build modules using different languages and link -those modules into the Clif but even more he can add new language +interpreter system. You can write procedures within the Clif +specification, you can build modules using different languages and link +those modules into the Clif but even more you can add new language structures to Clif. A detailed description can be found in the directory doc. The --- clif-0.93.orig/ch-lex.c +++ clif-0.93/ch-lex.c @@ -67,7 +67,7 @@ int yy_channelmorfg; extern char *yy_channelsptr, yy_channelsbuf[]; int yy_channeltchar; -FILE *yy_channelin = {stdin}, *yy_channelout = {stdout}; +FILE *yy_channelin, *yy_channelout; extern int yy_channellineno; struct yy_channelsvf { struct yy_channelwork *yy_channelstoff; @@ -116,6 +116,7 @@ static int __lex_hack = 0; if (__lex_hack) goto yy_channelfussy; #endif +yy_channelout = stdout; while((nstr_channel = yy_channellook()) >= 0) yy_channelfussy: switch(nstr_channel){ case 0: @@ -1142,6 +1143,7 @@ yy_channelinput_channel() #endif { + yy_channelin = stdin; #ifndef __cplusplus return(input_channel()); #else @@ -1155,6 +1157,7 @@ int c; #endif { + yy_channelout = stdout; #ifndef __cplusplus output_channel(c); #else --- clif-0.93.orig/comp_maint.c +++ clif-0.93/comp_maint.c @@ -3675,8 +3675,8 @@ if (warning_yes || warning_format) { char buf[2]; - buf[0] = va_arg(point, char); - buf[1] = va_arg(point, char); + buf[0] = va_arg(point, int); + buf[1] = va_arg(point, int); ERROR_FULL_INFO(spf[s].line_counter); fprintfx (stderr, "use of `%c' length character with `%c' type character\n", --- clif-0.93.orig/init_rs.c +++ clif-0.93/init_rs.c @@ -190,8 +190,10 @@ } argc_rs = argc1; pfrs = fopen (name, "r"); +#ifdef DEBUG if (pfrs == NULL) - fprintfx (stderr, "\nwarning: clif.ini does not exist\n"); + fprintfx (stderr, "\nwarning: %s does not exist\n", name); +#endif #ifdef FLEX_SCANNER yy_rs_in = pfrs; --- clif-0.93.orig/ls.l +++ clif-0.93/ls.l @@ -31,6 +31,7 @@ #endif #include "global.h" #include "mystdio.h" +#include "type.h" #include "tables.h" #include "token.h" #include "dbg-out.h" @@ -518,6 +519,16 @@ *yysptr++ = yytchar;} #else +#define yy_set_interactive(is_interactive) \ + { \ + if ( ! YY_CURRENT_BUFFER ){ \ + yyensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + yy_create_buffer(yyin,YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ + } + void switch_to_stdin () { --- clif-0.93.orig/myintrinsic.c +++ clif-0.93/myintrinsic.c @@ -80,7 +80,11 @@ int transform_to_simple_type PROTO((enum global_type)); -FILE *str[100]={stdin,stdout,stderr}; /* Handles of standard devices. + +FILE *str[100] ; + +/* FILE *str[100]={stdin,stdout,stderr}; */ +/* Handles of standard devices. * 0 - stdin * 1 - stdout * 2 - stderr @@ -274,6 +278,9 @@ cfprintf (a) char **a; { + str[0] = stdin; + str[1] = stdout; + str[2] = stderr; return do_fprintf (str[*(int *)a[0]], &a[2]); } @@ -282,6 +289,9 @@ cprintf (a) char **a; { + str[0] = stdin; + str[1] = stdout; + str[2] = stderr; return do_fprintf (str[1], a); } @@ -431,6 +441,9 @@ cfscanf (a) char **a; { + str[0] = stdin; + str[1] = stdout; + str[2] = stderr; return do_fscanf (str[*(int *)a[0]], &a[1]); } @@ -439,6 +452,9 @@ cscanf (a) char **a; { + str[0] = stdin; + str[1] = stdout; + str[2] = stderr; return do_fscanf (str[0], a); } @@ -452,6 +468,9 @@ { char *fn, *type; + str[0] = stdin; + str[1] = stdout; + str[2] = stderr; fn = (char *)a[0]; type = (char *)a[1]; @@ -470,6 +489,9 @@ { int *handle; + str[0] = stdin; + str[1] = stdout; + str[2] = stderr; handle = (int *)a[0]; handle_pointer--; @@ -486,6 +508,9 @@ char *c; int *handle; + str[0] = stdin; + str[1] = stdout; + str[2] = stderr; c = (char *)a[0]; handle = (int *)a[1]; @@ -500,6 +525,9 @@ { int *handle; + str[0] = stdin; + str[1] = stdout; + str[2] = stderr; handle = (int *)a[0]; return (fgetc (str[*handle])); @@ -510,6 +538,9 @@ cfflush (a) char **a; { + str[0] = stdin; + str[1] = stdout; + str[2] = stderr; return fflush (str[*(int *)a[0]]); } --- clif-0.93.orig/pso.c +++ clif-0.93/pso.c @@ -29,6 +29,7 @@ #include "allocx.h" #include "flags.h" #include "global.h" +#include "type.h" #include "tables.h" #include "type.h" #include "struct.h" --- clif-0.93.orig/virtual_machine.c +++ clif-0.93/virtual_machine.c @@ -38,6 +38,7 @@ #include "input.h" /* Redefining of input function. */ #include "virtual_machine.h" #include "printfx.h" +#include "type.h" #include "tables.h" #include "lex_t.h" #include "dbg-out.h" --- clif-0.93.orig/c-lex.c +++ clif-0.93/c-lex.c @@ -1,32 +1,85 @@ -/* A lexical scanner generated by flex */ -/* Scanner skeleton version: - * $FreeBSD: src/usr.bin/lex/skel.c,v 1.2.2.1 1999/08/29 15:29:33 peter Exp $ - */ +#line 3 "lex.yy.c" + +#define YY_INT_ALIGNED short int + +/* A lexical scanner generated by flex */ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_SUBMINOR_VERSION 31 +#if YY_FLEX_SUBMINOR_VERSION > 0 +#define FLEX_BETA +#endif + +/* First, we deal with platform-specific or compiler-specific issues. */ +/* begin standard C headers. */ #include +#include +#include +#include +/* end standard C headers. */ -/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ -#ifdef c_plusplus -#ifndef __cplusplus -#define __cplusplus +/* flex integer type definitions */ + +#ifndef FLEXINT_H +#define FLEXINT_H + +/* C99 systems have . Non-C99 systems may or may not. */ + +#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L +#include +typedef int8_t flex_int8_t; +typedef uint8_t flex_uint8_t; +typedef int16_t flex_int16_t; +typedef uint16_t flex_uint16_t; +typedef int32_t flex_int32_t; +typedef uint32_t flex_uint32_t; +#else +typedef signed char flex_int8_t; +typedef short int flex_int16_t; +typedef int flex_int32_t; +typedef unsigned char flex_uint8_t; +typedef unsigned short int flex_uint16_t; +typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ + +/* Limits of integral types. */ +#ifndef INT8_MIN +#define INT8_MIN (-128) +#endif +#ifndef INT16_MIN +#define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif +#ifndef INT8_MAX +#define INT8_MAX (127) +#endif +#ifndef INT16_MAX +#define INT16_MAX (32767) +#endif +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif +#ifndef UINT8_MAX +#define UINT8_MAX (255U) #endif +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) +#endif +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) #endif +#endif /* ! FLEXINT_H */ #ifdef __cplusplus -#include -#include - -/* Use prototypes in function declarations. */ -#define YY_USE_PROTOS - /* The "const" storage-class-modifier is valid. */ #define YY_USE_CONST @@ -34,34 +87,17 @@ #if __STDC__ -#define YY_USE_PROTOS #define YY_USE_CONST #endif /* __STDC__ */ #endif /* ! __cplusplus */ -#ifdef __TURBOC__ - #pragma warn -rch - #pragma warn -use -#include -#include -#define YY_USE_CONST -#define YY_USE_PROTOS -#endif - #ifdef YY_USE_CONST #define yyconst const #else #define yyconst #endif - -#ifdef YY_USE_PROTOS -#define YY_PROTO(proto) proto -#else -#define YY_PROTO(proto) () -#endif - /* Returned upon end-of-file. */ #define YY_NULL 0 @@ -76,71 +112,71 @@ * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ -#define BEGIN yy_start = 1 + 2 * +#define BEGIN (yy_start) = 1 + 2 * /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ -#define YY_START ((yy_start - 1) / 2) +#define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart( yyin ) +#define YY_NEW_FILE yyrestart(yyin ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ +#ifndef YY_BUF_SIZE #define YY_BUF_SIZE 16384 +#endif +#ifndef YY_TYPEDEF_YY_BUFFER_STATE +#define YY_TYPEDEF_YY_BUFFER_STATE typedef struct yy_buffer_state *YY_BUFFER_STATE; +#endif extern int yyleng; + extern FILE *yyin, *yyout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 -/* The funky do-while in the following #define is used to turn the definition - * int a single C statement (which needs a semi-colon terminator). This - * avoids problems with code like: - * - * if ( condition_holds ) - * yyless( 5 ); - * else - * do_something_else(); - * - * Prior to using the do-while the compiler would get upset at the - * "else" because it interpreted the "if" statement as being all - * done when it reached the ';' after the yyless() call. - */ - -/* Return all but the first 'n' matched characters back to the input stream. */ - + #define YY_LESS_LINENO(n) + +/* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ do \ { \ /* Undo effects of setting up yytext. */ \ - *yy_cp = yy_hold_char; \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + *yy_cp = (yy_hold_char); \ YY_RESTORE_YY_MORE_OFFSET \ - yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \ + (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) -#define unput(c) yyunput( c, yytext_ptr ) +#define unput(c) yyunput( c, (yytext_ptr) ) /* The following is because we cannot portably get our hands on size_t * (without autoconf's help, which isn't available because we want * flex-generated scanners to compile on their own). */ -typedef unsigned int yy_size_t; +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef unsigned int yy_size_t; +#endif +#ifndef YY_STRUCT_YY_BUFFER_STATE +#define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state { FILE *yy_input_file; @@ -177,12 +213,16 @@ */ int yy_at_bol; + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ + /* Whether to try to fill the input buffer when we reach the * end of it. */ int yy_fill_buffer; int yy_buffer_status; + #define YY_BUFFER_NEW 0 #define YY_BUFFER_NORMAL 1 /* When an EOF's been seen but there's still some text to process @@ -196,23 +236,33 @@ * just pointing yyin at a new input file. */ #define YY_BUFFER_EOF_PENDING 2 + }; +#endif /* !YY_STRUCT_YY_BUFFER_STATE */ -static YY_BUFFER_STATE yy_current_buffer = 0; +/* Stack of input buffers. */ +static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ +static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ +static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general * "scanner state". + * + * Returns the top of the stack, or NULL. */ -#define YY_CURRENT_BUFFER yy_current_buffer +#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ + ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ + : NULL) +/* Same as previous macro, but useful when we know that the buffer stack is not + * NULL or when we need an lvalue. For internal use only. + */ +#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; - static int yy_n_chars; /* number of characters read into yy_ch_buf */ - - int yyleng; /* Points to current character in buffer. */ @@ -225,66 +275,92 @@ */ static int yy_did_buffer_switch_on_eof; -void yyrestart YY_PROTO(( FILE *input_file )); - -void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer )); -void yy_load_buffer_state YY_PROTO(( void )); -YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size )); -void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b )); -void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file )); -void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b )); -#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer ) - -YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size )); -YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str )); -YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len )); - -static void *yy_flex_alloc YY_PROTO(( yy_size_t )); -static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )); -static void yy_flex_free YY_PROTO(( void * )); +void yyrestart (FILE *input_file ); +void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); +void yy_delete_buffer (YY_BUFFER_STATE b ); +void yy_flush_buffer (YY_BUFFER_STATE b ); +void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state (void ); + +static void yyensure_buffer_stack (void ); +static void yy_load_buffer_state (void ); +static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); + +#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) + +YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); +YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ); + +void *yyalloc (yy_size_t ); +void *yyrealloc (void *,yy_size_t ); +void yyfree (void * ); #define yy_new_buffer yy_create_buffer #define yy_set_interactive(is_interactive) \ { \ - if ( ! yy_current_buffer ) \ - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ - yy_current_buffer->yy_is_interactive = is_interactive; \ + if ( ! YY_CURRENT_BUFFER ){ \ + yyensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + yy_create_buffer(yyin,YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } #define yy_set_bol(at_bol) \ { \ - if ( ! yy_current_buffer ) \ - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ - yy_current_buffer->yy_at_bol = at_bol; \ + if ( ! YY_CURRENT_BUFFER ){\ + yyensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + yy_create_buffer(yyin,YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } -#define YY_AT_BOL() (yy_current_buffer->yy_at_bol) +#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) + +/* Begin user sect3 */ typedef unsigned char YY_CHAR; + FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; + typedef int yy_state_type; + +extern int yylineno; + +int yylineno = 1; + extern char *yytext; #define yytext_ptr yytext -static yy_state_type yy_get_previous_state YY_PROTO(( void )); -static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state )); -static int yy_get_next_buffer YY_PROTO(( void )); -static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); +static yy_state_type yy_get_previous_state (void ); +static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); +static int yy_get_next_buffer (void ); +static void yy_fatal_error (yyconst char msg[] ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ - yytext_ptr = yy_bp; \ - yyleng = (int) (yy_cp - yy_bp); \ - yy_hold_char = *yy_cp; \ + (yytext_ptr) = yy_bp; \ + yyleng = (size_t) (yy_cp - yy_bp); \ + (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ - yy_c_buf_p = yy_cp; + (yy_c_buf_p) = yy_cp; #define YY_NUM_RULES 55 #define YY_END_OF_BUFFER 56 -static yyconst short int yy_accept[130] = +/* This struct is not used in this scanner, + but its presence is necessary. */ +struct yy_trans_info + { + flex_int32_t yy_verify; + flex_int32_t yy_nxt; + }; +static yyconst flex_int16_t yy_accept[130] = { 0, 0, 0, 56, 54, 1, 2, 40, 54, 54, 54, 54, 54, 54, 54, 54, 54, 12, 12, 54, 54, @@ -302,7 +378,7 @@ 0, 15, 6, 5, 0, 20, 0, 20, 0 } ; -static yyconst int yy_ec[256] = +static yyconst flex_int32_t yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -334,7 +410,7 @@ 1, 1, 1, 1, 1 } ; -static yyconst int yy_meta[47] = +static yyconst flex_int32_t yy_meta[47] = { 0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 4, 4, 4, @@ -343,7 +419,7 @@ 5, 5, 5, 5, 2, 2 } ; -static yyconst short int yy_base[136] = +static yyconst flex_int16_t yy_base[136] = { 0, 0, 0, 257, 343, 343, 343, 229, 218, 227, 38, 42, 226, 35, 36, 34, 42, 59, 203, 40, 224, @@ -362,7 +438,7 @@ 330, 332, 337, 67, 59 } ; -static yyconst short int yy_def[136] = +static yyconst flex_int16_t yy_def[136] = { 0, 129, 1, 129, 129, 129, 129, 129, 130, 129, 129, 131, 129, 129, 129, 129, 129, 129, 17, 129, 129, @@ -381,7 +457,7 @@ 129, 129, 129, 129, 129 } ; -static yyconst short int yy_nxt[390] = +static yyconst flex_int16_t yy_nxt[390] = { 0, 4, 5, 6, 5, 7, 8, 4, 9, 10, 11, 4, 4, 12, 13, 14, 15, 16, 17, 18, 18, @@ -427,7 +503,7 @@ 129, 129, 129, 129, 129, 129, 129, 129, 129 } ; -static yyconst short int yy_chk[390] = +static yyconst flex_int16_t yy_chk[390] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -476,6 +552,9 @@ static yy_state_type yy_last_accepting_state; static char *yy_last_accepting_cpos; +extern int yy_flex_debug; +int yy_flex_debug = 0; + /* The intent behind this definition is that it'll catch * any uses of REJECT which flex missed. */ @@ -485,7 +564,6 @@ #define YY_RESTORE_YY_MORE_OFFSET char *yytext; #line 1 "ls.l" -#define INITIAL 0 #line 2 "ls.l" /* Clif - A C-like Interpreter Framework @@ -519,6 +597,7 @@ #endif #include "global.h" #include "mystdio.h" +#include "type.h" #include "tables.h" #include "token.h" #include "dbg-out.h" @@ -553,7 +632,21 @@ #define NL '\n' /* In the following there is no the " character. */ /* The $, `, @ characters are not in ANSI C Standard. */ -#line 557 "lex.yy.c" +#line 636 "lex.yy.c" + +#define INITIAL 0 + +#ifndef YY_NO_UNISTD_H +/* Special case for "unistd.h", since it is non-ANSI. We include it way + * down here because we want the user's section 1 to have been scanned first. + * The user has a chance to override it with an option. + */ +#include +#endif + +#ifndef YY_EXTRA_TYPE +#define YY_EXTRA_TYPE void * +#endif /* Macros after this point can all be overridden by user definitions in * section 1. @@ -561,65 +654,30 @@ #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap YY_PROTO(( void )); +extern "C" int yywrap (void ); #else -extern int yywrap YY_PROTO(( void )); +extern int yywrap (void ); #endif #endif -#ifndef YY_NO_UNPUT -static void yyunput YY_PROTO(( int c, char *buf_ptr )); -#endif - + static void yyunput (int c,char *buf_ptr ); + #ifndef yytext_ptr -static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int )); +static void yy_flex_strncpy (char *,yyconst char *,int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen YY_PROTO(( yyconst char * )); +static int yy_flex_strlen (yyconst char * ); #endif #ifndef YY_NO_INPUT -#ifdef __cplusplus -static int yyinput YY_PROTO(( void )); -#else -static int input YY_PROTO(( void )); -#endif -#endif - -#if YY_STACK_USED -static int yy_start_stack_ptr = 0; -static int yy_start_stack_depth = 0; -static int *yy_start_stack = 0; -#ifndef YY_NO_PUSH_STATE -static void yy_push_state YY_PROTO(( int new_state )); -#endif -#ifndef YY_NO_POP_STATE -static void yy_pop_state YY_PROTO(( void )); -#endif -#ifndef YY_NO_TOP_STATE -static int yy_top_state YY_PROTO(( void )); -#endif +#ifdef __cplusplus +static int yyinput (void ); #else -#define YY_NO_PUSH_STATE 1 -#define YY_NO_POP_STATE 1 -#define YY_NO_TOP_STATE 1 +static int input (void ); #endif -#ifdef YY_MALLOC_DECL -YY_MALLOC_DECL -#else -#if __STDC__ -#ifndef __cplusplus -#include -#endif -#else -/* Just try to get by without declaring the routines. This will fail - * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int) - * or sizeof(void*) != sizeof(int). - */ -#endif #endif /* Amount of stuff to slurp up with each read. */ @@ -628,7 +686,6 @@ #endif /* Copy whatever the last rule matched to the standard output. */ - #ifndef ECHO /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). @@ -641,9 +698,10 @@ */ #ifndef YY_INPUT #define YY_INPUT(buf,result,max_size) \ - if ( yy_current_buffer->yy_is_interactive ) \ + if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ - int c = '*', n; \ + int c = '*'; \ + size_t n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -653,9 +711,22 @@ YY_FATAL_ERROR( "input in flex scanner failed" ); \ result = n; \ } \ - else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \ - && ferror( yyin ) ) \ - YY_FATAL_ERROR( "input in flex scanner failed" ); + else \ + { \ + errno=0; \ + while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + { \ + if( errno != EINTR) \ + { \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + break; \ + } \ + errno=0; \ + clearerr(yyin); \ + } \ + }\ +\ + #endif /* No semi-colon after return; correct usage is to write "yyterminate();" - @@ -676,12 +747,18 @@ #define YY_FATAL_ERROR(msg) yy_fatal_error( msg ) #endif +/* end tables serialization structures and prototypes */ + /* Default declaration of generated scanner - a define so the user can * easily add parameters. */ #ifndef YY_DECL -#define YY_DECL int yylex YY_PROTO(( void )) -#endif +#define YY_DECL_IS_OURS 1 + +extern int yylex (void); + +#define YY_DECL int yylex (void) +#endif /* !YY_DECL */ /* Code executed at the beginning of each rule, after yytext and yyleng * have been set up. @@ -698,26 +775,28 @@ #define YY_RULE_SETUP \ YY_USER_ACTION +/** The main scanner function which does all the work. + */ YY_DECL - { +{ register yy_state_type yy_current_state; register char *yy_cp, *yy_bp; register int yy_act; + +#line 91 "ls.l" -#line 90 "ls.l" - -#line 710 "lex.yy.c" +#line 789 "lex.yy.c" - if ( yy_init ) + if ( (yy_init) ) { - yy_init = 0; + (yy_init) = 0; #ifdef YY_USER_INIT YY_USER_INIT; #endif - if ( ! yy_start ) - yy_start = 1; /* first start state */ + if ( ! (yy_start) ) + (yy_start) = 1; /* first start state */ if ( ! yyin ) yyin = stdin; @@ -725,34 +804,36 @@ if ( ! yyout ) yyout = stdout; - if ( ! yy_current_buffer ) - yy_current_buffer = - yy_create_buffer( yyin, YY_BUF_SIZE ); + if ( ! YY_CURRENT_BUFFER ) { + yyensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = + yy_create_buffer(yyin,YY_BUF_SIZE ); + } - yy_load_buffer_state(); + yy_load_buffer_state( ); } while ( 1 ) /* loops until end-of-file is reached */ { - yy_cp = yy_c_buf_p; + yy_cp = (yy_c_buf_p); /* Support of yytext. */ - *yy_cp = yy_hold_char; + *yy_cp = (yy_hold_char); /* yy_bp points to the position in yy_ch_buf of the start of * the current run. */ yy_bp = yy_cp; - yy_current_state = yy_start; + yy_current_state = (yy_start); yy_match: do { register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; if ( yy_accept[yy_current_state] ) { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -769,37 +850,36 @@ yy_act = yy_accept[yy_current_state]; if ( yy_act == 0 ) { /* have to back up */ - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); yy_act = yy_accept[yy_current_state]; } YY_DO_BEFORE_ACTION; - do_action: /* This label is used only to access EOF actions. */ - switch ( yy_act ) { /* beginning of action switch */ case 0: /* must back up */ /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = yy_hold_char; - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; + *yy_cp = (yy_hold_char); + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); goto yy_find_action; case 1: YY_RULE_SETUP -#line 91 "ls.l" +#line 92 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); /* * tabs, spaces */} YY_BREAK case 2: +/* rule 2 can match eol */ YY_RULE_SETUP -#line 95 "ls.l" +#line 96 "ls.l" { #ifdef FLEX_SCANNER spf[s].line_counter++; @@ -812,7 +892,7 @@ YY_BREAK case 3: YY_RULE_SETUP -#line 104 "ls.l" +#line 105 "ls.l" { sscanf (yytext, "%ux", &yylval.myuint); char_counter += yyleng; @@ -822,7 +902,7 @@ YY_BREAK case 4: YY_RULE_SETUP -#line 110 "ls.l" +#line 111 "ls.l" { sscanf (yytext, "%lx", &yylval.mylint); char_counter += yyleng; @@ -832,7 +912,7 @@ YY_BREAK case 5: YY_RULE_SETUP -#line 116 "ls.l" +#line 117 "ls.l" { sscanf (yytext, "%lux", &yylval.myluint); char_counter += yyleng; @@ -842,7 +922,7 @@ YY_BREAK case 6: YY_RULE_SETUP -#line 122 "ls.l" +#line 123 "ls.l" { sscanf (yytext, "%lx", &yylval.myluint); char_counter += yyleng; @@ -852,7 +932,7 @@ YY_BREAK case 7: YY_RULE_SETUP -#line 128 "ls.l" +#line 129 "ls.l" { sscanf (yytext, "%x", &yylval.myint); char_counter += yyleng; @@ -862,7 +942,7 @@ YY_BREAK case 8: YY_RULE_SETUP -#line 134 "ls.l" +#line 135 "ls.l" { sscanf (yytext, "%u", &yylval.myuint); char_counter += yyleng; @@ -874,7 +954,7 @@ YY_BREAK case 9: YY_RULE_SETUP -#line 142 "ls.l" +#line 143 "ls.l" { sscanf (yytext, "%ld", &yylval.mylint); char_counter += yyleng; @@ -886,7 +966,7 @@ YY_BREAK case 10: YY_RULE_SETUP -#line 150 "ls.l" +#line 151 "ls.l" { sscanf (yytext, "%lu", &yylval.myluint); char_counter += yyleng; @@ -898,7 +978,7 @@ YY_BREAK case 11: YY_RULE_SETUP -#line 158 "ls.l" +#line 159 "ls.l" { sscanf (yytext, "%lu", &yylval.myluint); char_counter += yyleng; @@ -910,7 +990,7 @@ YY_BREAK case 12: YY_RULE_SETUP -#line 166 "ls.l" +#line 167 "ls.l" { sscanf (yytext, "%d", &yylval.myint); char_counter += yyleng; @@ -922,7 +1002,7 @@ YY_BREAK case 13: YY_RULE_SETUP -#line 174 "ls.l" +#line 175 "ls.l" { sscanf (yytext, "%f", &yylval.myfloat); char_counter += yyleng; @@ -934,7 +1014,7 @@ YY_BREAK case 14: YY_RULE_SETUP -#line 182 "ls.l" +#line 183 "ls.l" { sscanf (yytext, "%Lf", &yylval.myldouble); char_counter += yyleng; @@ -946,7 +1026,7 @@ YY_BREAK case 15: YY_RULE_SETUP -#line 190 "ls.l" +#line 191 "ls.l" { sscanf (yytext, "%lf", &yylval.mydouble); char_counter += yyleng; @@ -958,7 +1038,7 @@ YY_BREAK case 16: YY_RULE_SETUP -#line 198 "ls.l" +#line 199 "ls.l" {char_counter += yyleng; yytext[0] = 0; strcat (line_buf, "'\\0'"); @@ -967,8 +1047,9 @@ } YY_BREAK case 17: +/* rule 17 can match eol */ YY_RULE_SETUP -#line 204 "ls.l" +#line 205 "ls.l" { int i, j; char_counter += yyleng; @@ -1057,7 +1138,7 @@ YY_BREAK case 18: YY_RULE_SETUP -#line 289 "ls.l" +#line 290 "ls.l" { int i; strcat (line_buf, yytext); @@ -1082,8 +1163,9 @@ } YY_BREAK case 19: +/* rule 19 can match eol */ YY_RULE_SETUP -#line 311 "ls.l" +#line 312 "ls.l" { #ifdef FLEX_SCANNER char *str; @@ -1109,7 +1191,7 @@ YY_BREAK case 20: YY_RULE_SETUP -#line 333 "ls.l" +#line 334 "ls.l" {char name[20],*tmp_p; int w,ab=' '; char_counter += yyleng; @@ -1158,8 +1240,9 @@ } YY_BREAK case 21: +/* rule 21 can match eol */ YY_RULE_SETUP -#line 379 "ls.l" +#line 380 "ls.l" {int wide_string = 0; char_counter += yyleng; if (yytext[0] == 'l') @@ -1183,122 +1266,122 @@ YY_BREAK case 22: YY_RULE_SETUP -#line 399 "ls.l" +#line 400 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (RIGHT_ASSIGN);} YY_BREAK case 23: YY_RULE_SETUP -#line 400 "ls.l" +#line 401 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (LEFT_ASSIGN);} YY_BREAK case 24: YY_RULE_SETUP -#line 401 "ls.l" +#line 402 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (ADD_ASSIGN);} YY_BREAK case 25: YY_RULE_SETUP -#line 402 "ls.l" +#line 403 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (SUB_ASSIGN);} YY_BREAK case 26: YY_RULE_SETUP -#line 403 "ls.l" +#line 404 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (MUL_ASSIGN);} YY_BREAK case 27: YY_RULE_SETUP -#line 404 "ls.l" +#line 405 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (DIV_ASSIGN);} YY_BREAK case 28: YY_RULE_SETUP -#line 405 "ls.l" +#line 406 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (MOD_ASSIGN);} YY_BREAK case 29: YY_RULE_SETUP -#line 406 "ls.l" +#line 407 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (AND_ASSIGN);} YY_BREAK case 30: YY_RULE_SETUP -#line 407 "ls.l" +#line 408 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (XOR_ASSIGN);} YY_BREAK case 31: YY_RULE_SETUP -#line 408 "ls.l" +#line 409 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (OR_ASSIGN);} YY_BREAK case 32: YY_RULE_SETUP -#line 409 "ls.l" +#line 410 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (AND_A);} YY_BREAK case 33: YY_RULE_SETUP -#line 410 "ls.l" +#line 411 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (OR_A);} YY_BREAK case 34: YY_RULE_SETUP -#line 411 "ls.l" +#line 412 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (EQ_A);} YY_BREAK case 35: YY_RULE_SETUP -#line 412 "ls.l" +#line 413 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (GQ);} YY_BREAK case 36: YY_RULE_SETUP -#line 413 "ls.l" +#line 414 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (LQ);} YY_BREAK case 37: YY_RULE_SETUP -#line 414 "ls.l" +#line 415 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (NE_A);} YY_BREAK case 38: YY_RULE_SETUP -#line 415 "ls.l" +#line 416 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (PP);} YY_BREAK case 39: YY_RULE_SETUP -#line 416 "ls.l" +#line 417 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (MM);} YY_BREAK case 40: YY_RULE_SETUP -#line 417 "ls.l" +#line 418 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (NEG_T);} YY_BREAK case 41: YY_RULE_SETUP -#line 418 "ls.l" +#line 419 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (NEG_B);} YY_BREAK case 42: YY_RULE_SETUP -#line 419 "ls.l" +#line 420 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (SHIR);} YY_BREAK case 43: YY_RULE_SETUP -#line 420 "ls.l" +#line 421 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (SHIL);} YY_BREAK case 44: YY_RULE_SETUP -#line 421 "ls.l" +#line 422 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (PTR);} YY_BREAK case 45: YY_RULE_SETUP -#line 422 "ls.l" +#line 423 "ls.l" {char_counter += yyleng; strcat (line_buf, "#"); error_message (6032); @@ -1307,7 +1390,7 @@ YY_BREAK case 46: YY_RULE_SETUP -#line 427 "ls.l" +#line 428 "ls.l" {char_counter += yyleng; strcat (line_buf, "["); error_message (6032); @@ -1316,7 +1399,7 @@ YY_BREAK case 47: YY_RULE_SETUP -#line 432 "ls.l" +#line 433 "ls.l" {char_counter += yyleng; strcat (line_buf, "\\"); error_message (6032); @@ -1325,7 +1408,7 @@ YY_BREAK case 48: YY_RULE_SETUP -#line 437 "ls.l" +#line 438 "ls.l" {char_counter += yyleng; strcat (line_buf, "]"); error_message (6032); @@ -1334,7 +1417,7 @@ YY_BREAK case 49: YY_RULE_SETUP -#line 442 "ls.l" +#line 443 "ls.l" {char_counter += yyleng; strcat (line_buf, "^"); error_message (6032); @@ -1343,7 +1426,7 @@ YY_BREAK case 50: YY_RULE_SETUP -#line 447 "ls.l" +#line 448 "ls.l" {char_counter += yyleng; strcat (line_buf, "{"); error_message (6032); @@ -1352,7 +1435,7 @@ YY_BREAK case 51: YY_RULE_SETUP -#line 452 "ls.l" +#line 453 "ls.l" {char_counter += yyleng; strcat (line_buf, "|"); error_message (6032); @@ -1361,7 +1444,7 @@ YY_BREAK case 52: YY_RULE_SETUP -#line 457 "ls.l" +#line 458 "ls.l" {char_counter += yyleng; strcat (line_buf, "}"); error_message (6032); @@ -1370,7 +1453,7 @@ YY_BREAK case 53: YY_RULE_SETUP -#line 462 "ls.l" +#line 463 "ls.l" {char_counter += yyleng; strcat (line_buf, "~"); error_message (6032); @@ -1379,7 +1462,7 @@ YY_BREAK case 54: YY_RULE_SETUP -#line 468 "ls.l" +#line 469 "ls.l" {char_counter += yyleng; strcat (line_buf, yytext); return (*yytext); /* * Returns rest simple characters @@ -1387,36 +1470,36 @@ YY_BREAK case 55: YY_RULE_SETUP -#line 472 "ls.l" +#line 473 "ls.l" ECHO; YY_BREAK -#line 1394 "lex.yy.c" +#line 1477 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); case YY_END_OF_BUFFER: { /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1; + int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1; /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = yy_hold_char; + *yy_cp = (yy_hold_char); YY_RESTORE_YY_MORE_OFFSET - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) { /* We're scanning a new file or input source. It's * possible that this happened because the user * just pointed yyin at a new source and called * yylex(). If so, then we have to assure - * consistency between yy_current_buffer and our + * consistency between YY_CURRENT_BUFFER and our * globals. Here is the right place to do so, because * this is the first action (other than possibly a * back-up) that will match for the new input source. */ - yy_n_chars = yy_current_buffer->yy_n_chars; - yy_current_buffer->yy_input_file = yyin; - yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL; + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; } /* Note that here we test for yy_c_buf_p "<=" to the position @@ -1426,13 +1509,13 @@ * end-of-buffer state). Contrast this with the test * in input(). */ - if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] ) + if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) { /* This was really a NUL. */ yy_state_type yy_next_state; - yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text; + (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); /* Okay, we're now positioned to make the NUL * transition. We couldn't have @@ -1445,30 +1528,30 @@ yy_next_state = yy_try_NUL_trans( yy_current_state ); - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_bp = (yytext_ptr) + YY_MORE_ADJ; if ( yy_next_state ) { /* Consume the NUL. */ - yy_cp = ++yy_c_buf_p; + yy_cp = ++(yy_c_buf_p); yy_current_state = yy_next_state; goto yy_match; } else { - yy_cp = yy_c_buf_p; + yy_cp = (yy_c_buf_p); goto yy_find_action; } } - else switch ( yy_get_next_buffer() ) + else switch ( yy_get_next_buffer( ) ) { case EOB_ACT_END_OF_FILE: { - yy_did_buffer_switch_on_eof = 0; + (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap() ) + if ( yywrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -1479,7 +1562,7 @@ * YY_NULL, it'll still work - another * YY_NULL will get returned. */ - yy_c_buf_p = yytext_ptr + YY_MORE_ADJ; + (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ; yy_act = YY_STATE_EOF(YY_START); goto do_action; @@ -1487,30 +1570,30 @@ else { - if ( ! yy_did_buffer_switch_on_eof ) + if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; } break; } case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = - yytext_ptr + yy_amount_of_matched_text; + (yy_c_buf_p) = + (yytext_ptr) + yy_amount_of_matched_text; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); - yy_cp = yy_c_buf_p; - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; goto yy_match; case EOB_ACT_LAST_MATCH: - yy_c_buf_p = - &yy_current_buffer->yy_ch_buf[yy_n_chars]; + (yy_c_buf_p) = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); - yy_cp = yy_c_buf_p; - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; goto yy_find_action; } break; @@ -1521,8 +1604,7 @@ "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ - } /* end of yylex */ - +} /* end of yylex */ /* yy_get_next_buffer - try to read in a new buffer * @@ -1531,21 +1613,20 @@ * EOB_ACT_CONTINUE_SCAN - continue scanning from current position * EOB_ACT_END_OF_FILE - end of file */ - -static int yy_get_next_buffer() - { - register char *dest = yy_current_buffer->yy_ch_buf; - register char *source = yytext_ptr; +static int yy_get_next_buffer (void) +{ + register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + register char *source = (yytext_ptr); register int number_to_move, i; int ret_val; - if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] ) + if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) YY_FATAL_ERROR( "fatal flex scanner internal error--end of buffer missed" ); - if ( yy_current_buffer->yy_fill_buffer == 0 ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) { /* Don't try to fill the buffer, so this is an EOF. */ - if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 ) + if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 ) { /* We matched a single character, the EOB, so * treat this as a final EOF. @@ -1565,34 +1646,30 @@ /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1; + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) /* don't do the read, it's not guaranteed to return an EOF, * just force an EOF */ - yy_current_buffer->yy_n_chars = yy_n_chars = 0; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0; else { - int num_to_read = - yy_current_buffer->yy_buf_size - number_to_move - 1; + size_t num_to_read = + YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ -#ifdef YY_USES_REJECT - YY_FATAL_ERROR( -"input buffer overflow, can't enlarge buffer because scanner uses REJECT" ); -#else /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = yy_current_buffer; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER; int yy_c_buf_p_offset = - (int) (yy_c_buf_p - b->yy_ch_buf); + (int) ((yy_c_buf_p) - b->yy_ch_buf); if ( b->yy_is_our_buffer ) { @@ -1605,8 +1682,7 @@ b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yy_flex_realloc( (void *) b->yy_ch_buf, - b->yy_buf_size + 2 ); + yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); } else /* Can't grow it, we don't own it. */ @@ -1616,35 +1692,35 @@ YY_FATAL_ERROR( "fatal error - scanner input buffer overflow" ); - yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; + (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; - num_to_read = yy_current_buffer->yy_buf_size - + num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; -#endif + } if ( num_to_read > YY_READ_BUF_SIZE ) num_to_read = YY_READ_BUF_SIZE; /* Read in more data. */ - YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]), - yy_n_chars, num_to_read ); + YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), + (yy_n_chars), num_to_read ); - yy_current_buffer->yy_n_chars = yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } - if ( yy_n_chars == 0 ) + if ( (yy_n_chars) == 0 ) { if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart( yyin ); + yyrestart(yyin ); } else { ret_val = EOB_ACT_LAST_MATCH; - yy_current_buffer->yy_buffer_status = + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_EOF_PENDING; } } @@ -1652,32 +1728,31 @@ else ret_val = EOB_ACT_CONTINUE_SCAN; - yy_n_chars += number_to_move; - yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR; - yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; + (yy_n_chars) += number_to_move; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; - yytext_ptr = &yy_current_buffer->yy_ch_buf[0]; + (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; return ret_val; - } - +} /* yy_get_previous_state - get the state just before the EOB char was reached */ -static yy_state_type yy_get_previous_state() - { + static yy_state_type yy_get_previous_state (void) +{ register yy_state_type yy_current_state; register char *yy_cp; + + yy_current_state = (yy_start); - yy_current_state = yy_start; - - for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp ) + for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -1689,30 +1764,23 @@ } return yy_current_state; - } - +} /* yy_try_NUL_trans - try to make a transition on the NUL character * * synopsis * next_state = yy_try_NUL_trans( current_state ); */ - -#ifdef YY_USE_PROTOS -static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state ) -#else -static yy_state_type yy_try_NUL_trans( yy_current_state ) -yy_state_type yy_current_state; -#endif - { + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) +{ register int yy_is_jam; - register char *yy_cp = yy_c_buf_p; + register char *yy_cp = (yy_c_buf_p); register YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -1724,80 +1792,73 @@ yy_is_jam = (yy_current_state == 129); return yy_is_jam ? 0 : yy_current_state; - } - +} -#ifndef YY_NO_UNPUT -#ifdef YY_USE_PROTOS -static void yyunput( int c, register char *yy_bp ) -#else -static void yyunput( c, yy_bp ) -int c; -register char *yy_bp; -#endif - { - register char *yy_cp = yy_c_buf_p; + static void yyunput (int c, register char * yy_bp ) +{ + register char *yy_cp; + + yy_cp = (yy_c_buf_p); /* undo effects of setting up yytext */ - *yy_cp = yy_hold_char; + *yy_cp = (yy_hold_char); - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register int number_to_move = yy_n_chars + 2; - register char *dest = &yy_current_buffer->yy_ch_buf[ - yy_current_buffer->yy_buf_size + 2]; + register int number_to_move = (yy_n_chars) + 2; + register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; register char *source = - &yy_current_buffer->yy_ch_buf[number_to_move]; + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; - while ( source > yy_current_buffer->yy_ch_buf ) + while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) *--dest = *--source; yy_cp += (int) (dest - source); yy_bp += (int) (dest - source); - yy_current_buffer->yy_n_chars = - yy_n_chars = yy_current_buffer->yy_buf_size; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size; - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) YY_FATAL_ERROR( "flex scanner push-back overflow" ); } *--yy_cp = (char) c; + (yytext_ptr) = yy_bp; + (yy_hold_char) = *yy_cp; + (yy_c_buf_p) = yy_cp; +} - yytext_ptr = yy_bp; - yy_hold_char = *yy_cp; - yy_c_buf_p = yy_cp; - } -#endif /* ifndef YY_NO_UNPUT */ - - +#ifndef YY_NO_INPUT #ifdef __cplusplus -static int yyinput() + static int yyinput (void) #else -static int input() + static int input (void) #endif - { - int c; - *yy_c_buf_p = yy_hold_char; +{ + int c; + + *(yy_c_buf_p) = (yy_hold_char); - if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) + if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) { /* yy_c_buf_p now points to the character we want to return. * If this occurs *before* the EOB characters, then it's a * valid NUL; if not, then we've hit the end of the buffer. */ - if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] ) + if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) /* This was really a NUL. */ - *yy_c_buf_p = '\0'; + *(yy_c_buf_p) = '\0'; else { /* need more input */ - int offset = yy_c_buf_p - yytext_ptr; - ++yy_c_buf_p; + int offset = (yy_c_buf_p) - (yytext_ptr); + ++(yy_c_buf_p); - switch ( yy_get_next_buffer() ) + switch ( yy_get_next_buffer( ) ) { case EOB_ACT_LAST_MATCH: /* This happens because yy_g_n_b() @@ -1811,16 +1872,16 @@ */ /* Reset buffer status. */ - yyrestart( yyin ); + yyrestart(yyin ); - /* fall through */ + /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap() ) + if ( yywrap( ) ) return EOF; - if ( ! yy_did_buffer_switch_on_eof ) + if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; #ifdef __cplusplus return yyinput(); @@ -1830,90 +1891,92 @@ } case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = yytext_ptr + offset; + (yy_c_buf_p) = (yytext_ptr) + offset; break; } } } - c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */ - *yy_c_buf_p = '\0'; /* preserve yytext */ - yy_hold_char = *++yy_c_buf_p; - + c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ + *(yy_c_buf_p) = '\0'; /* preserve yytext */ + (yy_hold_char) = *++(yy_c_buf_p); return c; - } - - -#ifdef YY_USE_PROTOS -void yyrestart( FILE *input_file ) -#else -void yyrestart( input_file ) -FILE *input_file; -#endif - { - if ( ! yy_current_buffer ) - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); +} +#endif /* ifndef YY_NO_INPUT */ - yy_init_buffer( yy_current_buffer, input_file ); - yy_load_buffer_state(); +/** Immediately switch to a different input stream. + * @param input_file A readable stream. + * + * @note This function does not reset the start condition to @c INITIAL . + */ + void yyrestart (FILE * input_file ) +{ + + if ( ! YY_CURRENT_BUFFER ){ + yyensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = + yy_create_buffer(yyin,YY_BUF_SIZE ); } + yy_init_buffer(YY_CURRENT_BUFFER,input_file ); + yy_load_buffer_state( ); +} -#ifdef YY_USE_PROTOS -void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer ) -#else -void yy_switch_to_buffer( new_buffer ) -YY_BUFFER_STATE new_buffer; -#endif - { - if ( yy_current_buffer == new_buffer ) +/** Switch to a different input buffer. + * @param new_buffer The new input buffer. + * + */ + void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) +{ + + /* TODO. We should be able to replace this entire function body + * with + * yypop_buffer_state(); + * yypush_buffer_state(new_buffer); + */ + yyensure_buffer_stack (); + if ( YY_CURRENT_BUFFER == new_buffer ) return; - if ( yy_current_buffer ) + if ( YY_CURRENT_BUFFER ) { /* Flush out information for old buffer. */ - *yy_c_buf_p = yy_hold_char; - yy_current_buffer->yy_buf_pos = yy_c_buf_p; - yy_current_buffer->yy_n_chars = yy_n_chars; + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } - yy_current_buffer = new_buffer; - yy_load_buffer_state(); + YY_CURRENT_BUFFER_LVALUE = new_buffer; + yy_load_buffer_state( ); /* We don't actually know whether we did this switch during * EOF (yywrap()) processing, but the only time this flag * is looked at is after yywrap() is called, so it's safe * to go ahead and always set it. */ - yy_did_buffer_switch_on_eof = 1; - } - - -#ifdef YY_USE_PROTOS -void yy_load_buffer_state( void ) -#else -void yy_load_buffer_state() -#endif - { - yy_n_chars = yy_current_buffer->yy_n_chars; - yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos; - yyin = yy_current_buffer->yy_input_file; - yy_hold_char = *yy_c_buf_p; - } + (yy_did_buffer_switch_on_eof) = 1; +} +static void yy_load_buffer_state (void) +{ + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; + yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; + (yy_hold_char) = *(yy_c_buf_p); +} -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_create_buffer( FILE *file, int size ) -#else -YY_BUFFER_STATE yy_create_buffer( file, size ) -FILE *file; -int size; -#endif - { +/** Allocate and initialize an input buffer state. + * @param file A readable stream. + * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. + * + * @return the allocated buffer state. + */ + YY_BUFFER_STATE yy_create_buffer (FILE * file, int size ) +{ YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); + + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -1922,80 +1985,75 @@ /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer( b, file ); + yy_init_buffer(b,file ); return b; - } - +} -#ifdef YY_USE_PROTOS -void yy_delete_buffer( YY_BUFFER_STATE b ) -#else -void yy_delete_buffer( b ) -YY_BUFFER_STATE b; -#endif - { +/** Destroy the buffer. + * @param b a buffer created with yy_create_buffer() + * + */ + void yy_delete_buffer (YY_BUFFER_STATE b ) +{ + if ( ! b ) return; - if ( b == yy_current_buffer ) - yy_current_buffer = (YY_BUFFER_STATE) 0; + if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ + YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yy_flex_free( (void *) b->yy_ch_buf ); + yyfree((void *) b->yy_ch_buf ); - yy_flex_free( (void *) b ); - } - - -#ifndef YY_ALWAYS_INTERACTIVE -#ifndef YY_NEVER_INTERACTIVE -extern int isatty YY_PROTO(( int )); -#endif -#endif - -#ifdef YY_USE_PROTOS -void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) -#else -void yy_init_buffer( b, file ) -YY_BUFFER_STATE b; -FILE *file; -#endif + yyfree((void *) b ); +} +#ifndef __cplusplus +extern int isatty (int ); +#endif /* __cplusplus */ + +/* Initializes or reinitializes a buffer. + * This function is sometimes called more than once on the same buffer, + * such as during a yyrestart() or at EOF. + */ + static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file ) - { - yy_flush_buffer( b ); +{ + int oerrno = errno; + + yy_flush_buffer(b ); b->yy_input_file = file; b->yy_fill_buffer = 1; -#if YY_ALWAYS_INTERACTIVE - b->yy_is_interactive = 1; -#else -#if YY_NEVER_INTERACTIVE - b->yy_is_interactive = 0; -#else - b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; -#endif -#endif - } - + /* If b is the current buffer, then yy_init_buffer was _probably_ + * called from yyrestart() or through yy_get_next_buffer. + * In that case, we don't want to reset the lineno or column. + */ + if (b != YY_CURRENT_BUFFER){ + b->yy_bs_lineno = 1; + b->yy_bs_column = 0; + } -#ifdef YY_USE_PROTOS -void yy_flush_buffer( YY_BUFFER_STATE b ) -#else -void yy_flush_buffer( b ) -YY_BUFFER_STATE b; -#endif + b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; + + errno = oerrno; +} - { - if ( ! b ) +/** Discard all buffered characters. On the next scan, YY_INPUT will be called. + * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. + * + */ + void yy_flush_buffer (YY_BUFFER_STATE b ) +{ + if ( ! b ) return; b->yy_n_chars = 0; @@ -2012,29 +2070,121 @@ b->yy_at_bol = 1; b->yy_buffer_status = YY_BUFFER_NEW; - if ( b == yy_current_buffer ) - yy_load_buffer_state(); + if ( b == YY_CURRENT_BUFFER ) + yy_load_buffer_state( ); +} + +/** Pushes the new state onto the stack. The new state becomes + * the current state. This function will allocate the stack + * if necessary. + * @param new_buffer The new state. + * + */ +void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) +{ + if (new_buffer == NULL) + return; + + yyensure_buffer_stack(); + + /* This block is copied from yy_switch_to_buffer. */ + if ( YY_CURRENT_BUFFER ) + { + /* Flush out information for old buffer. */ + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + } + + /* Only push if top exists. Otherwise, replace top. */ + if (YY_CURRENT_BUFFER) + (yy_buffer_stack_top)++; + YY_CURRENT_BUFFER_LVALUE = new_buffer; + + /* copied from yy_switch_to_buffer. */ + yy_load_buffer_state( ); + (yy_did_buffer_switch_on_eof) = 1; +} + +/** Removes and deletes the top of the stack, if present. + * The next element becomes the new top. + * + */ +void yypop_buffer_state (void) +{ + if (!YY_CURRENT_BUFFER) + return; + + yy_delete_buffer(YY_CURRENT_BUFFER ); + YY_CURRENT_BUFFER_LVALUE = NULL; + if ((yy_buffer_stack_top) > 0) + --(yy_buffer_stack_top); + + if (YY_CURRENT_BUFFER) { + yy_load_buffer_state( ); + (yy_did_buffer_switch_on_eof) = 1; + } +} + +/* Allocates the stack if it does not exist. + * Guarantees space for at least one push. + */ +static void yyensure_buffer_stack (void) +{ + int num_to_alloc; + + if (!(yy_buffer_stack)) { + + /* First allocation is just for 2 elements, since we don't know if this + * scanner will even need a stack. We use 2 instead of 1 to avoid an + * immediate realloc on the next call. + */ + num_to_alloc = 1; + (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc + (num_to_alloc * sizeof(struct yy_buffer_state*) + ); + + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); + + (yy_buffer_stack_max) = num_to_alloc; + (yy_buffer_stack_top) = 0; + return; } + if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ -#ifndef YY_NO_SCAN_BUFFER -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size ) -#else -YY_BUFFER_STATE yy_scan_buffer( base, size ) -char *base; -yy_size_t size; -#endif - { - YY_BUFFER_STATE b; + /* Increase the buffer to prepare for a possible push. */ + int grow_size = 8 /* arbitrary grow size */; + num_to_alloc = (yy_buffer_stack_max) + grow_size; + (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc + ((yy_buffer_stack), + num_to_alloc * sizeof(struct yy_buffer_state*) + ); + + /* zero only the new slots.*/ + memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); + (yy_buffer_stack_max) = num_to_alloc; + } +} + +/** Setup the input buffer state to scan directly from a user-specified character buffer. + * @param base the character buffer + * @param size the size in bytes of the character buffer + * + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) +{ + YY_BUFFER_STATE b; + if ( size < 2 || base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ return 0; - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); @@ -2048,47 +2198,43 @@ b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer( b ); + yy_switch_to_buffer(b ); return b; - } -#endif - - -#ifndef YY_NO_SCAN_STRING -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str ) -#else -YY_BUFFER_STATE yy_scan_string( yy_str ) -yyconst char *yy_str; -#endif - { - int len; - for ( len = 0; yy_str[len]; ++len ) - ; - - return yy_scan_bytes( yy_str, len ); - } -#endif +} +/** Setup the input buffer state to scan a string. The next call to yylex() will + * scan from a @e copy of @a str. + * @param str a NUL-terminated string to scan + * @param yy_str a NUL-terminated string to scan + * + * @return the newly allocated buffer state object. + * @note If you want to scan bytes that may contain NUL values, then use + * yy_scan_bytes() instead. + */ +YY_BUFFER_STATE yy_scan_string (yyconst char * yy_str ) +{ + + return yy_scan_bytes(yy_str,strlen(yy_str) ); +} -#ifndef YY_NO_SCAN_BYTES -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len ) -#else -YY_BUFFER_STATE yy_scan_bytes( bytes, len ) -yyconst char *bytes; -int len; -#endif - { +/** Setup the input buffer state to scan the given bytes. The next call to yylex() will + * scan from a @e copy of @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. + * + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE yy_scan_bytes (yyconst char * bytes, int len ) +{ YY_BUFFER_STATE b; char *buf; yy_size_t n; int i; - + /* Get memory for full buffer, including space for trailing EOB's. */ n = len + 2; - buf = (char *) yy_flex_alloc( n ); + buf = (char *) yyalloc(n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); @@ -2097,7 +2243,7 @@ buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer( buf, n ); + b = yy_scan_buffer(buf,n ); if ( ! b ) YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); @@ -2107,148 +2253,164 @@ b->yy_is_our_buffer = 1; return b; - } -#endif - +} -#ifndef YY_NO_PUSH_STATE -#ifdef YY_USE_PROTOS -static void yy_push_state( int new_state ) -#else -static void yy_push_state( new_state ) -int new_state; +#ifndef YY_EXIT_FAILURE +#define YY_EXIT_FAILURE 2 #endif - { - if ( yy_start_stack_ptr >= yy_start_stack_depth ) - { - yy_size_t new_size; - yy_start_stack_depth += YY_START_STACK_INCR; - new_size = yy_start_stack_depth * sizeof( int ); +static void yy_fatal_error (yyconst char* msg ) +{ + (void) fprintf( stderr, "%s\n", msg ); + exit( YY_EXIT_FAILURE ); +} - if ( ! yy_start_stack ) - yy_start_stack = (int *) yy_flex_alloc( new_size ); +/* Redefine yyless() so it works in section 3 code. */ - else - yy_start_stack = (int *) yy_flex_realloc( - (void *) yy_start_stack, new_size ); +#undef yyless +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up yytext. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + yytext[yyleng] = (yy_hold_char); \ + (yy_c_buf_p) = yytext + yyless_macro_arg; \ + (yy_hold_char) = *(yy_c_buf_p); \ + *(yy_c_buf_p) = '\0'; \ + yyleng = yyless_macro_arg; \ + } \ + while ( 0 ) - if ( ! yy_start_stack ) - YY_FATAL_ERROR( - "out of memory expanding start-condition stack" ); - } +/* Accessor methods (get/set functions) to struct members. */ - yy_start_stack[yy_start_stack_ptr++] = YY_START; +/** Get the current line number. + * + */ +int yyget_lineno (void) +{ + + return yylineno; +} - BEGIN(new_state); - } -#endif +/** Get the input stream. + * + */ +FILE *yyget_in (void) +{ + return yyin; +} +/** Get the output stream. + * + */ +FILE *yyget_out (void) +{ + return yyout; +} -#ifndef YY_NO_POP_STATE -static void yy_pop_state() - { - if ( --yy_start_stack_ptr < 0 ) - YY_FATAL_ERROR( "start-condition stack underflow" ); +/** Get the length of the current token. + * + */ +int yyget_leng (void) +{ + return yyleng; +} - BEGIN(yy_start_stack[yy_start_stack_ptr]); - } -#endif +/** Get the current token. + * + */ +char *yyget_text (void) +{ + return yytext; +} -#ifndef YY_NO_TOP_STATE -static int yy_top_state() - { - return yy_start_stack[yy_start_stack_ptr - 1]; - } -#endif +/** Set the current line number. + * @param line_number + * + */ +void yyset_lineno (int line_number ) +{ + + yylineno = line_number; +} -#ifndef YY_EXIT_FAILURE -#define YY_EXIT_FAILURE 2 -#endif +/** Set the input stream. This does not discard the current + * input buffer. + * @param in_str A readable stream. + * + * @see yy_switch_to_buffer + */ +void yyset_in (FILE * in_str ) +{ + yyin = in_str ; +} -#ifdef YY_USE_PROTOS -static void yy_fatal_error( yyconst char msg[] ) -#else -static void yy_fatal_error( msg ) -char msg[]; -#endif - { - (void) fprintf( stderr, "%s\n", msg ); - exit( YY_EXIT_FAILURE ); - } +void yyset_out (FILE * out_str ) +{ + yyout = out_str ; +} +int yyget_debug (void) +{ + return yy_flex_debug; +} +void yyset_debug (int bdebug ) +{ + yy_flex_debug = bdebug ; +} -/* Redefine yyless() so it works in section 3 code. */ +/* yylex_destroy is for both reentrant and non-reentrant scanners. */ +int yylex_destroy (void) +{ + + /* Pop the buffer stack, destroying each element. */ + while(YY_CURRENT_BUFFER){ + yy_delete_buffer(YY_CURRENT_BUFFER ); + YY_CURRENT_BUFFER_LVALUE = NULL; + yypop_buffer_state(); + } -#undef yyless -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - yytext[yyleng] = yy_hold_char; \ - yy_c_buf_p = yytext + n; \ - yy_hold_char = *yy_c_buf_p; \ - *yy_c_buf_p = '\0'; \ - yyleng = n; \ - } \ - while ( 0 ) + /* Destroy the stack itself. */ + yyfree((yy_buffer_stack) ); + (yy_buffer_stack) = NULL; + return 0; +} -/* Internal utility routines. */ +/* + * Internal utility routines. + */ #ifndef yytext_ptr -#ifdef YY_USE_PROTOS -static void yy_flex_strncpy( char *s1, yyconst char *s2, int n ) -#else -static void yy_flex_strncpy( s1, s2, n ) -char *s1; -yyconst char *s2; -int n; -#endif - { +static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +{ register int i; - for ( i = 0; i < n; ++i ) + for ( i = 0; i < n; ++i ) s1[i] = s2[i]; - } +} #endif #ifdef YY_NEED_STRLEN -#ifdef YY_USE_PROTOS -static int yy_flex_strlen( yyconst char *s ) -#else -static int yy_flex_strlen( s ) -yyconst char *s; -#endif - { +static int yy_flex_strlen (yyconst char * s ) +{ register int n; - for ( n = 0; s[n]; ++n ) + for ( n = 0; s[n]; ++n ) ; return n; - } +} #endif - -#ifdef YY_USE_PROTOS -static void *yy_flex_alloc( yy_size_t size ) -#else -static void *yy_flex_alloc( size ) -yy_size_t size; -#endif - { +void *yyalloc (yy_size_t size ) +{ return (void *) malloc( size ); - } +} -#ifdef YY_USE_PROTOS -static void *yy_flex_realloc( void *ptr, yy_size_t size ) -#else -static void *yy_flex_realloc( ptr, size ) -void *ptr; -yy_size_t size; -#endif - { +void *yyrealloc (void * ptr, yy_size_t size ) +{ /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -2257,26 +2419,29 @@ * as though doing an assignment. */ return (void *) realloc( (char *) ptr, size ); - } +} -#ifdef YY_USE_PROTOS -static void yy_flex_free( void *ptr ) -#else -static void yy_flex_free( ptr ) -void *ptr; -#endif - { - free( ptr ); - } +void yyfree (void * ptr ) +{ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ +} -#if YY_MAIN -int main() - { - yylex(); - return 0; - } +#define YYTABLES_NAME "yytables" + +#undef YY_NEW_FILE +#undef YY_FLUSH_BUFFER +#undef yy_set_bol +#undef yy_new_buffer +#undef yy_set_interactive +#undef yytext_ptr +#undef YY_DO_BEFORE_ACTION + +#ifdef YY_DECL_IS_OURS +#undef YY_DECL_IS_OURS +#undef YY_DECL #endif -#line 472 "ls.l" +#line 473 "ls.l" + struct el_mc { char *name; @@ -2326,6 +2491,16 @@ *yysptr++ = yytchar;} #else +#define yy_set_interactive(is_interactive) \ + { \ + if ( ! YY_CURRENT_BUFFER ){ \ + yyensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + yy_create_buffer(yyin,YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ + } + void switch_to_stdin () { @@ -2376,3 +2551,4 @@ } #endif /* ! FLEX_SCANNER */ + --- clif-0.93.orig/test.c +++ clif-0.93/test.c @@ -0,0 +1,7 @@ +int main() +{ + int a = 2; + printf("%i\n", a + a); + return 0; +} + debian/rules0000755000000000000000000000413111320140664010242 0ustar #!/usr/bin/make -f #export DH_VERBOSE=1 export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else CFLAGS += -O2 endif # FOR AUTOCONF 2.52 AND NEWER ONLY ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) confflags += --build $(DEB_HOST_GNU_TYPE) else confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) endif confflags += --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info configure: configure-stamp configure-stamp: dh_testdir ./configure $(confflags) --prefix=/usr --sysconfdir=/etc touch configure-stamp build: configure-stamp build-stamp build-stamp: dh_testdir $(MAKE) cd doc && dvips -o guide_programmers.ps guide_programmers.dvi cd doc && dvips -o guide_users.ps guide_users.dvi cd doc && dvips -o cimcsp94.ps cimcsp94.dvi touch build-stamp clean: dh_testdir dh_testroot [ ! -f Makefile ] || $(MAKE) distclean rm -rf doc/guide_programmers doc/guide_users *.ps cd doc && rm -f cimcsp94.ps guide_programmers.ps guide_users.ps rm -f build-stamp configure-stamp dh_clean install: build dh_testdir dh_testroot dh_clean -k $(MAKE) install DESTDIR=`pwd`/debian/clif dh_installdirs usr/bin usr/lib/clif dh_install clif usr/bin dh_install small.hlp io.ci clif.ini usr/lib/clif # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot # dh_installdebconf dh_installdocs README TODO running_notes doc/*.ps doc/*.dvi dh_installexamples example/* dh_installmenu # dh_installemacsen # dh_installpam # dh_installinit dh_installcron dh_installman doc/clif.1 dh_installinfo dh_installmime dh_installchangelogs ChangeLog dh_link dh_strip dh_compress -Xexamples dh_fixperms dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure debian/compat0000644000000000000000000000000211320133555010362 0ustar 5 debian/source/0000755000000000000000000000000011320140722010456 5ustar debian/source/format0000644000000000000000000000001411320133334011665 0ustar 3.0 (quilt) debian/changelog0000644000000000000000000001176511320140713011042 0ustar clif (0.93-9) unstable; urgency=low * Switch package format to 3.0 (quilt). * Use quilt for patch management. * Use debhelper for build management. This causes DEB_BUILD_OPTIONS=nostrip to be honoured (Closes: #436630). * debian/control: + Build-depend on debhelper. + Build-depend on texlive instead of tetex-bin (Closes: #562345). -- Sam Hocevar Sun, 03 Jan 2010 16:29:22 +0100 clif (0.93-8) unstable; urgency=low * debian/control: + Set policy to 3.6.2.1. * ls.l tables.h: + Fixed various FTBFS errors (Closes: #299667). -- Sam Hocevar (Debian packages) Wed, 24 Aug 2005 15:51:05 +0200 clif (0.93-7) unstable; urgency=low * debian/control: + Build-depend on libxt-dev because AC_PATH_X requires it. * debian/rules: + Reverted --x-includes --x-libraries change. -- Sam Hocevar (Debian packages) Wed, 4 Aug 2004 22:38:36 +0200 clif (0.93-6) unstable; urgency=low * debian/control: + Build-depend on libelfg0-dev. * debian/rules: + Explicitely configure with --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib. -- Sam Hocevar (Debian packages) Tue, 3 Aug 2004 21:29:34 +0200 clif (0.93-5) unstable; urgency=low * debian/control: + Set policy to 3.6.1.1. + Build-depend on libx11-dev instead of xlibs-dev. -- Sam Hocevar (Debian packages) Mon, 2 Aug 2004 13:27:19 +0200 clif (0.93-4) unstable; urgency=low * New maintainer (Closes: #86241). * Set policy to 3.5.10. * Removed warning when clif.ini is not found (Closes: #128931). * Removed sexist pronouns from README (Closes: #159420). * Removed the manpage's links section because the webpage and FTP archive no longer exist (Closes: #128930). -- Sam Hocevar (Debian packages) Mon, 26 May 2003 13:27:55 +0200 clif (0.93-3) unstable; urgency=low * Orphaned this package. -- Adrian Bunk Fri, 25 Jan 2002 14:05:49 +0100 clif (0.93-2) unstable; urgency=low * Fixed two calls to va_arg in comp_maint.c (needed for gcc-3.0). (closes: #103683) * Don't install the INSTALL file. -- Adrian Bunk Fri, 6 Jul 2001 09:39:53 +0200 clif (0.93-1) unstable; urgency=low * New maintainer. (closes: #83101) * New upstream release. * Added build dependencies. * Standards-Version: 3.1.1 -- Adrian Bunk Wed, 14 Feb 2001 19:27:09 +0100 clif (0.92-5) unstable; urgency=low * debian/control: Orphaning package. -- Antti-Juhani Kaijanaho Mon, 27 Nov 2000 21:36:52 +0200 clif (0.92-4) unstable; urgency=low * debian/control: Policy 3.0.1. * debian/rules: /usr/doc -> /usr/share/doc, /usr/man -> /usr/share/man * debian/{prerm,postinst,rules}: Implement the /usr/doc transition. * Removed all .orig and .rej files from the source tree. * debian/rules: Remove $(rootdir) at start of binary targets. -- Antti-Juhani Kaijanaho Sat, 18 Sep 1999 20:10:05 +0300 clif (0.92-3) unstable; urgency=low * debian/control: New maintainer. * debian/control: policy 2.5.1 + no changes necessary + not using policy >= 3, as requested by the Project Leader * debian/changelog: added the NMU changelog entry for 0.90.2-3.1, as recommended by the DDR. * debian/changelog.{orig,rej}: removed. * debian/rules: Modified heavily to comply with my standards + Use debian/*.stamp files. + Don't remove debian/tmp on binary targets. + Abstract the various install commands with variables. + Don't try to copy nonexistent files. + Get package name from changelog. + Abstract the various install dirs with variables. + Don't check rootness, as the failing commands will reveal a problem. + Use a separete configure target. * debian/README.debian: Removed as useless. -- Antti-Juhani Kaijanaho Sat, 7 Aug 1999 15:22:25 +0300 clif (0.92-2) unstable; urgency=low * Roman Hodek reports that config.cache is not removed on cleaning. -- John Lapeyre Wed, 16 Jun 1999 14:17:08 -0700 clif (0.92-1) unstable; urgency=low * New upstream version. * Include author's manpage -- John Lapeyre Thu, 25 Mar 1999 17:31:53 -0700 clif (0.90.2-3.1) frozen unstable; urgency=low * non maintainer, sparc only upload * fix initializer not constant bugs with glibc2.1 -- Christian Meder Tue, 24 Nov 1998 14:33:50 +0100 clif (0.90.2-3) unstable; urgency=low * Added Slootman's patch for cpp syntax error -- John Lapeyre Sun, 27 Sep 1998 16:14:06 -0700 clif (0.90.2-2) unstable; urgency=low * Checked compiler option, change to cc. -- John Lapeyre Mon, 21 Sep 1998 22:02:22 -0700 clif (0.90.2-1) unstable; urgency=low * Initial Release. -- John Lapeyre Mon, 3 Aug 1998 20:56:11 -0700 Local variables: mode: debian-changelog End: debian/buildnotes0000644000000000000000000000067710634233265011277 0ustar gcc works ok, except one compiler warning or error, but almost all tests pass test60.ci fails. compiling with egcc causes mosts tests to fail Mon, 14 Jun 1999 21:41:55 -0700 libc6 2.1.1 does not have constant io streams. The file 'myintrinsics.c' failed to compile because it uses non-constant initializers for *str[]. But the functions which use *str[] always set the values anyway, so I just removed the initialization in the declaration. debian/control0000644000000000000000000000114211320135113010555 0ustar Source: clif Section: interpreters Priority: optional Maintainer: Sam Hocevar Build-Depends: debhelper (>= 5.0), libx11-dev, libxt-dev, texlive, libelfg0-dev Standards-Version: 3.8.3 Package: clif Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: C language interpreter Clif, a C-like Interpreter Framework, is and open-ended system for fast development of programs with C syntax. The program is compiled and if syntactically correct, code is immediately generated. The code is generated for a virtual machine. The virtual machine is a part of the framework.