%{
#include <string.h>
-#include "q.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include "../lib/q.h"
#include "parser.h"
//RVALUE {NUMBER}|{PERCENT}|{NAME}|\"{STRING}\"|{DIM}
}
prefix = 0;
break;
- case LABEL:
- string_set2(&tmp, text, length-1);
+ case RAWDATA:
+ string_set2(&tmp, text+1/*:*/, length-5/*.end*/);
token.text = (char*)mem_putstring(&strings, tmp);
break;
case COMMAND:
#define MAX_INCLUDE_DEPTH 16
YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH];
+int line_stack[MAX_INCLUDE_DEPTH];
+int column_stack[MAX_INCLUDE_DEPTH];
int include_stack_ptr = 0;
void handleInclude(char*text, int len)
fprintf( stderr, "Includes nested too deeply" );
exit( 1 );
}
- include_stack[include_stack_ptr++] = YY_CURRENT_BUFFER;
+ include_stack[include_stack_ptr] = YY_CURRENT_BUFFER;
+ line_stack[include_stack_ptr] = line;
+ column_stack[include_stack_ptr] = column;
+ include_stack_ptr++;
yyin = fopen(text, "rb");
if (!yyin) {
fprintf(stderr, "Couldn't open %s\n", text);
%x BINARY
NAME [a-zA-Z_./](-*[a-zA-Z0-9_./])*
-TWIP ([0-9]+(\.([0-9]([05])?)?)?)
-NUMBER [0-9]+(\.[0-9]*)?
+TWIP (-?[0-9]+(\.([0-9]([05])?)?)?)
+NUMBER -?[0-9]+(\.[0-9]*)?
PERCENT {NUMBER}%
STRING (\\.|[^\\"\n])*
S [ \n\r\t]
{NAME}{S}*-= {s(ASSIGNMENT);prefix="<minus>";c();BEGIN(R);}
{NAME}{S}*= {s(ASSIGNMENT);c();BEGIN(R);}
<R>{ /* values which appear only on the right-hand side of assignments, like: x=50% */
- [^ \n\t\r]* {s(IDENTIFIER);c();BEGIN(0);}
+ [^ :\n\t\r]* {s(IDENTIFIER);c();BEGIN(0);}
}
\.include{S}.*\n {handleInclude(yytext, yyleng);}
\.{NAME} {s(COMMAND);c();}
-{NAME}{S}*: {s(LABEL);c();}
+:([^.]|\.[^e]|\.e[^n]|\.en[^d]|[ \n\r\t])*\.end {s(RAWDATA);c();}
{NAME} {s(IDENTIFIER);c();}
"[" {c();BEGIN(BINARY);}
{S} {c();}
yy_delete_buffer( YY_CURRENT_BUFFER );
yy_switch_to_buffer(
include_stack[include_stack_ptr] );
+ column = column_stack[include_stack_ptr];
+ line = line_stack[include_stack_ptr];
}
}