clean up/fix %include parsing

- allow spaces in filename, but strip trailing whitespace (including \r)
- proper error for missing filename

Author: ChrisDodd

reader.c

@@ -188,9 +188,13 @@ char *get_line() {
   if(strncmp(&line[0], "%include ", 9)==0) {
     char *name = line+9;
     while (isspace(*name)) name++;
-    for(i=0; name[i]!='\n' && name[i]!=' '; i++);
+    i = strlen(name);
+    while (i > 0 && isspace(name[i-1])) --i;
     name[i] = 0;
-    read_from_file(name);
+    if (i == 0)
+      error(input_file->lineno, 0, 0, "No file name with %include");
+    else
+      read_from_file(name);
     goto NextLine;
   }
 

test/f 2.inc

@@ -0,0 +1,5 @@
+expr: expr op1 expr %prec LO
+    | expr op2 expr %prec HI
+    | unary expr %prec UNARY
+    ;
+

test/f1.inc

@@ -0,0 +1,3 @@
+%left LO '+' '-'
+%left HI '*' '/' '%'
+%nonassoc UNARY

test/include.y

@@ -0,0 +1,23 @@
+/*
+ * [test] btyacc
+ * [test] cc -c -Wall -Werror
+ *
+ * testing trailing spaces/tabs on %include lines
+ */
+%include f1.inc          
+
+%%
+
+%include        f 2.inc   
+
+op1 : '+'
+    | '-'
+    ;
+
+op2 : '*'
+    | '/'
+    | '%'
+    ;
+
+unary : '+' | '-' | '*' | '&' ;
+