matiec: comparison stage1

equal deleted inserted replaced

-:0f3f6714b938
+:32bd7ef40897
 * track of the locations, in order to give
 * more meaningful error messages!
 */
 extern YYLTYPE yylloc;
+#define YY_INPUT(buf,result,max_size)  {\
+result = GetNextChar(buf, max_size);\
+if (  result <= 0  )\
+result = YY_NULL;\
+}
 /* Macro that is executed for every action.
 * We use it to pass the location of the token
 * back to the bison parser...
 */
-#define YY_USER_ACTION { 					\
+#define YY_USER_ACTION {\
-	yylloc.first_line = yylloc.last_line = yylineno;	\
+	  yylloc.first_line = current_tracking->lineNumber;\
-	yylloc.first_column = yylloc.last_column = 0;		\
+	yylloc.first_column = current_tracking->currentTokenStart;\
+	yylloc.last_line = current_tracking->lineNumber;\
+	yylloc.last_column = current_tracking->currentChar - 1;\
+	current_tracking->currentTokenStart = current_tracking->currentChar;\
 	}
 /* Since this lexical parser we defined only works in ASCII based
 * systems, we might as well make sure it is being compiled on
 %{
 #define MAX_INCLUDE_DEPTH 16
 typedef struct {
 	  YY_BUFFER_STATE buffer_state;
-	  int lineno;
+	  tracking_t* env;
 	  const char *filename;
 	} include_stack_t;
+tracking_t* current_tracking;
 include_stack_t include_stack[MAX_INCLUDE_DEPTH];
 int include_stack_ptr = 0;
 const char *INCLUDE_DIRECTORIES[] = {
 	DEFAULT_LIBDIR,
 letter		[A-Za-z]
 digit		[0-9]
 octal_digit	[0-7]
 hex_digit	{digit}|[A-F]
 identifier	({letter}|(_({letter}|{digit})))((_?({letter}|{digit}))*)
+invalid_identifier ({letter}|{digit}|_)*
 /*******************/
 /* B.1.2 Constants */
 /*******************/
 	if (get_pop_state()) {
 	  yy_pop_state();
 	  rst_pop_state();
 	}
 	/***************************/
 	/* Handle the pragmas!     */
 	/***************************/
 			  if (include_stack_ptr >= MAX_INCLUDE_DEPTH) {
 			    fprintf(stderr, "Includes nested too deeply\n");
 			    exit( 1 );
 			  }
+include_stack[include_stack_ptr].buffer_state = YY_CURRENT_BUFFER;
-			  (include_stack[include_stack_ptr]).buffer_state = YY_CURRENT_BUFFER;
+include_stack[include_stack_ptr].env = current_tracking;
-			  (include_stack[include_stack_ptr]).lineno = yylineno;
+include_stack[include_stack_ptr].filename = current_filename;
-			  (include_stack[include_stack_ptr]).filename = current_filename;
-			  include_stack_ptr++;
-			  yylineno = 1;
-			  current_filename = strdup(yytext);
 			  for (i = 0, yyin = NULL; (INCLUDE_DIRECTORIES[i] != NULL) && (yyin == NULL); i++) {
 			    char *full_name = strdup3(INCLUDE_DIRECTORIES[i], "/", yytext);
 			    if (full_name == NULL) {
 			      fprintf(stderr, "Out of memory!\n");
 			      exit( 1 );
 			  if (!yyin) {
 			    fprintf(stderr, "Error opening included file %s\n", yytext);
 			    exit( 1 );
 			  }
+			  current_filename = strdup(yytext);
+			  current_tracking = GetNewTracking(yyin);
+			  include_stack_ptr++;
 			  /* switch input buffer to new file... */
 			  yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
 			  /* switch to whatever state was active before the include file */
 			  yy_pop_state();
 			  /* now process the new file... */
 			       *       If we have finished parsing the main file, then we
 			       *       must leave include_stack_ptr at 0, in case the
 			       *       parser is called once again with a new file.
 			       *       (In fact, we currently do just that!)
 			       */
+			  free(current_tracking);
 			  if (include_stack_ptr == 0) {
 			      /* yyterminate() terminates the scanner and returns a 0 to the
 			       * scanner's  caller, indicating "all done".
 			       *
 			       * Our syntax parser (written with bison) has the token
 			       * calling yyterminate() is equivalent to doing that.
 			       */
 			    yyterminate();
 			  }
 else {
 			    --include_stack_ptr;
 			    yy_delete_buffer(YY_CURRENT_BUFFER);
 			    yy_switch_to_buffer((include_stack[include_stack_ptr]).buffer_state);
-			    yylineno = include_stack[include_stack_ptr].lineno;
+			    current_tracking = include_stack[include_stack_ptr].env;
 			      /* removing constness of char *. This is safe actually,
 			       * since the only real const char * that is stored on the stack is
 			       * the first one (i.e. the one that gets stored in include_stack[0],
 			       * which is never free'd!
 			       */
 	/* do the single character tokens...
 	 *
 	 *  e.g.:  ':'  '('  ')'  '+'  '*'  ...
 	 */
+{invalid_identifier} return INVALID_IDENTIFIER;
 .	{return yytext[0];}
 %%
 int i;
 if ((include_stack_ptr - 1) >= 0)
 fprintf (stderr, "in file ");
 for (i = include_stack_ptr - 1; i >= 0; i--)
-fprintf (stderr, "included from file %s:%d\n", include_stack[i].filename, include_stack[i].lineno);
+fprintf (stderr, "included from file %s:%d\n", include_stack[i].filename, include_stack[i].env->lineNumber);
 }
 /* return all the text in the current token back to the input stream, except the first n chars. */
 void unput_text(unsigned int n) {
 * if we return newlines back to the input stream. These newlines will be re-counted
 * a second time when they are processed again by flex.
 * We therefore determine how many newlines are in the text we are returning,
 * and decrement the line counter acordingly...
 */
-unsigned int i;
+/*unsigned int i;
-unsigned int line_number = 0;
-int before_yylineno = yylineno;
 for (i = n; i < strlen(yytext); i++)
 if (yytext[i] == '\n')
-line_number++;
+current_tracking->lineNumber--;*/
 /* now return all the text back to the input stream... */
 yyless(n);
-if (line_number > 0 && before_yylineno == yylineno)
-yylineno = yylineno - line_number;
 }
 /* Called by flex when it reaches the end-of-file */
 int yywrap(void)
 int main(int argc, char **argv) {
 FILE *in_file;
 int res;
 if (argc == 1) {
 /* Work as an interactive (command line) parser... */
 while((res=yylex()))
 fprintf(stderr, "(line %d)token: %d\n", yylineno, res);
 } else {
 while(1) {
 res=yylex();
 fprintf(stderr, "(line %d)token: %d (%s)\n", yylineno, res, yylval.ID);
 }
 }
-return 0;
+	return 0;
 }
 #endif

changeset 136	32bd7ef40897
parent 131	f55ef301e14c
child 151	3b898fb11e73