fix #include

- relative to enclosing file
- close on pop

Author: jcupitt

TODO

@@ -1,10 +1,3 @@
-- better #include file resolving
-
-    should be relative to enclosing file, if any
-
-
-
-
 - add something to open a dcraw image in 16 bits
 
 - text widget should have an rgba toggle

src/lex.l

@@ -274,7 +274,7 @@ FALSE {
 	BEGIN BINARY;
 
 	if (sscanf(yytext, "0x%x", &i ) != 1)
-		nip2yyerror(_( "bad number %s"), yytext);
+		nipyyerror(_( "bad number %s"), yytext);
 
 	yylval.yy_const.type = PARSE_CONST_NUM;
 	yylval.yy_const.val.num = i;
@@ -354,5 +354,5 @@ FALSE {
 [ \t\n\r\m\01] ;
 
 . {
-	nip2yyerror(_( "illegal character \"%c\"" ), *yytext);
+	nipyyerror(_( "illegal character \"%c\"" ), *yytext);
 }

src/model.c

@@ -309,6 +309,7 @@ model_loadstate_rewrite(ModelLoadState *state, char *old_rhs, char *new_rhs)
 		/* Here for yyerror in lex. Just ignore errors --- the parser
 		 * will spot them later anyway.
 		 */
+        reset_input_state();
 		model_loadstate = NULL;
 		return;
 	}

src/parse.y

@@ -261,14 +261,28 @@ directive:
         if ($2.type != PARSE_CONST_STR)
             yyerror(_("not string argument"));
 
-        iOpenFile *of = ifile_open_read("%s", $2.val.str);
+        iOpenFile *of;
+
+        /* Local paths are resolved relative to the enclosing file, if any.
+         */
+        InputState *is = get_input_state();
+        if (!is_absolute($2.val.str) &&
+            is->of &&
+            is->of->fname) {
+            g_autofree char *dirname = g_path_get_dirname(is->of->fname);
+            of = ifile_open_read("%s/%s", dirname, $2.val.str);
+        }
+        else
+            of = ifile_open_read("%s", $2.val.str);
+
         if (!of)
             yyerror(_("no such file"));
 
         push_input_state();
         attach_input_file(of);
 
-        // gets popped and freed on EOF
+        // close on pop
+        is->close = of;
     }
     ;
 
@@ -1023,7 +1037,7 @@ VipsBuf lex_text = VIPS_BUF_STATIC(lex_text_buffer);
 
 /* State of input system.
  */
-InputState input_state[MAX_INCLUDE];
+InputState input_state[MAX_INCLUDE] = { 0 };
 int input_state_p = 0;
 
 /* Defintions for the static decls at the top. We have to put the defs down
@@ -1048,10 +1062,10 @@ int parse_object_id = 0;
 /* Here for errors in parse.
  *
  * Bison calls yyerror with only a char* arg. This printf() version is called
- * from nip2 in a few places during parse.
+ * in a few places during parse.
  */
 void
-nip2yyerror(const char *sub, ...)
+nipyyerror(const char *sub, ...)
 {
     va_list ap;
     char buf[4096];
@@ -1077,7 +1091,7 @@ nip2yyerror(const char *sub, ...)
 void
 yyerror(const char *msg)
 {
-    nip2yyerror("%s", msg);
+    nipyyerror("%s", msg);
 }
 
 InputState *
@@ -1087,7 +1101,7 @@ get_input_state(void)
 }
 
 void
-push_input_state()
+push_input_state(void)
 {
     if (input_state_p >= MAX_INCLUDE)
         yyerror(_("too many nested includes"));
@@ -1096,14 +1110,30 @@ push_input_state()
 }
 
 void
-pop_input_state()
+pop_input_state(void)
 {
     if (input_state_p <= 0)
         yyerror(_("too many pops!"));
     else
         input_state_p -= 1;
 }
 
+void
+free_input_state(void)
+{
+    InputState *is = get_input_state();
+    VIPS_FREEF(ifile_close, is->close);
+}
+
+void
+reset_input_state(void)
+{
+    while (input_state_p > 0) {
+        free_input_state();
+        pop_input_state();
+    }
+}
+
 /* Attach yyinput to a file.
  */
 void
@@ -1244,6 +1274,7 @@ ip_input(void)
 	if (ch == 0) {
         if (input_state_p > 0) {
             // this input_state is at EOF, step out one level and try again
+            free_input_state();
             pop_input_state();
 
             return ip_input();
@@ -1572,6 +1603,8 @@ parse_input(int ch, Symbol *sym, Toolkit *kit, int pos)
     ip_unput(ch);
 
     if (setjmp(parse_error_point)) {
+        reset_input_state();
+
         /* Restore current_compile.
          */
         scope_pop_all();
@@ -1697,6 +1730,7 @@ parse_test_define(void)
     if (setjmp(parse_error_point)) {
         /* Here for yyerror in lex.
          */
+        reset_input_state();
         VIPS_FREE(ident);
 
         return NULL;
@@ -1736,6 +1770,7 @@ parse_set_symbol(void)
     if (setjmp(parse_error_point)) {
         /* Here for yyerror in lex.
          */
+        reset_input_state();
         VIPS_FREE(ident);
         return NULL;
     }
@@ -1753,11 +1788,11 @@ parse_set_symbol(void)
              * come. Look up this one and move to that context.
              */
             if (!(sym = compile_lookup(compile, ident)))
-                nip2yyerror(_("'%s' does not exist"),
+                nipyyerror(_("'%s' does not exist"),
                     ident);
             if (!sym->expr ||
                 !sym->expr->compile)
-                nip2yyerror(_("'%s' has no members"),
+                nipyyerror(_("'%s' has no members"),
                     ident);
             compile = sym->expr->compile;
             VIPS_FREE(ident);

src/parser.h

@@ -31,36 +31,40 @@
  * Keep track of the state of play here.
  */
 typedef struct {
-	iOpenFile *of; /* Non-NULL if we read from a file */
-	char *str;	   /* Non-NULL if we read from a string */
-	char *strpos;  /* Position in string */
+	iOpenFile *of;			/* Non-NULL if we read from a file */
+	char *str;				/* Non-NULL if we read from a string */
+	char *strpos;			/* Position in string */
 
-	char buf[MAX_STRSIZE]; /* Accumulate text of each definition here */
-	int bwp;			   /* Write point in the above */
-	int bsp[MAX_SSTACK];   /* Start point stack */
-	int bspsp;			   /* Stack pointer */
+	char buf[MAX_STRSIZE];	/* Accumulate text of each definition here */
+	int bwp;				/* Write point in the above */
+	int bsp[MAX_SSTACK];	/* Start point stack */
+	int bspsp;				/* Stack pointer */
 
-	int lineno;	 /* Current line number */
-	int charno;	 /* Character in line */
-	int pcharno; /* Characters in previous line */
-	int charpos; /* Characters read by lex so far */
+	int lineno;				/* Current line number */
+	int charno;				/* Character in line */
+	int pcharno;			/* Characters in previous line */
+	int charpos;			/* Characters read by lex so far */
 
-	int oldchar; /* unget buffer, -1 for no unget */
+	int oldchar;			/* unget buffer, -1 for no unget */
+
+	iOpenFile *close;		/* Close this iOpenFile on input_state close */
 } InputState;
 
 #define MAX_INCLUDE (20)
 extern InputState input_state[MAX_INCLUDE];
 extern int input_state_p;
 
-InputState *get_input_state();
-void pop_input_state();
-void push_input_state();
+InputState *get_input_state(void);
+void pop_input_state(void);
+void push_input_state(void);
+void free_input_state(void);
+void reset_input_state(void);
 
 extern int parse_serial_number;
 
 /* Function declarations for parse.y.
  */
-void nip2yyerror(const char *sub, ...)
+void nipyyerror(const char *sub, ...)
 	__attribute__((format(printf, 1, 2)));
 void yyerror(const char *msg);
 #ifdef YYLENG_IS_YY_SIZE_T

src/symbol.c

@@ -835,7 +835,7 @@ symbol_new_defining(Compile *compile, const char *name)
 	/* Block definition of "root" anywhere ... too confusing.
 	 */
 	if (strcmp(name, IOBJECT(symbol_root)->name) == 0)
-		nip2yyerror(_("Attempt to redefine root symbol \"%s\"."), name);
+		nipyyerror(_("Attempt to redefine root symbol \"%s\"."), name);
 
 	/* Is this a redefinition of an existing symbol in this scope?
 	 */
@@ -891,7 +891,7 @@ symbol_new_defining(Compile *compile, const char *name)
 			}
 			vips_buf_appendf(&buf, ".");
 
-			nip2yyerror("%s", vips_buf_all(&buf));
+			nipyyerror("%s", vips_buf_all(&buf));
 			/*NOTREACHED*/
 		}