[Crosstoolchain-logs] [device-tree-compiler] 262/357: dtc: Remove ugly include stack abuse

[Hector Oron]

This is an automated email from the git hooks/post-receive script.

zumbi pushed a commit to branch upstream/1.3.x
in repository device-tree-compiler.

commit 8a88ad8badfe54d91b35c5da25889de0db54f43e
Author: David Gibson <david at gibson.dropbear.id.au>
Date:   Thu Mar 6 12:45:41 2008 +1100

    dtc: Remove ugly include stack abuse
    
    Currently, dt_from_source() uses push_input_file() to set up the
    initial input file for the lexer.  That sounds sensible - put the
    outermost input file at the bottom of the stack - until you realise
    that what it *actually* does is pushes the current, uninitialized,
    lexer input state onto the stack, then sets up the new lexer input.
    
    That necessitates an extra check in pop_input_file(), rather than
    signalling termination in the natural way when the include stack is
    empty, it has to check when it pops the bogus uninitialized state off
    the stack.  Ick.
    
    With that fixed, push_input_file(), pop_input_file() and
    incl_file_stack itself become local to the lexer, so make them static.
    
    Signed-off-by: David Gibson <david at gibson.dropbear.id.au>
---
 dtc-lexer.l  | 12 ++++++------
 srcpos.h     |  3 ---
 treesource.c |  3 ++-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/dtc-lexer.l b/dtc-lexer.l
index a643ab3..04b1753 100644
--- a/dtc-lexer.l
+++ b/dtc-lexer.l
@@ -52,6 +52,9 @@ static int dts_version; /* = 0 */
 				DPRINT("<V1>\n"); \
 				BEGIN(V1); \
 			}
+
+static void push_input_file(const char *filename);
+static int pop_input_file(void);
 %}
 
 %%
@@ -229,7 +232,7 @@ struct incl_file {
 	struct incl_file *prev;
 };
 
-struct incl_file *incl_file_stack;
+static struct incl_file *incl_file_stack;
 
 
 /*
@@ -240,7 +243,7 @@ struct incl_file *incl_file_stack;
 static int incl_depth = 0;
 
 
-void push_input_file(const char *filename)
+static void push_input_file(const char *filename)
 {
 	struct incl_file *incl_file;
 	struct dtc_file *newfile;
@@ -282,7 +285,7 @@ void push_input_file(const char *filename)
 }
 
 
-int pop_input_file(void)
+static int pop_input_file(void)
 {
 	struct incl_file *incl_file;
 
@@ -312,8 +315,5 @@ int pop_input_file(void)
 	 */
 	free(incl_file);
 
-	if (YY_CURRENT_BUFFER == 0)
-		return 0;
-
 	return 1;
 }
diff --git a/srcpos.h b/srcpos.h
index d548c09..e17c7c0 100644
--- a/srcpos.h
+++ b/srcpos.h
@@ -75,9 +75,6 @@ extern void yyerrorf(char const *, ...) __attribute__((format(printf, 1, 2)));
 
 extern struct dtc_file *srcpos_file;
 
-extern void push_input_file(const char *filename);
-extern int pop_input_file(void);
-
 struct search_path {
 	const char *dir; /* NULL for current directory */
 	struct search_path *prev, *next;
diff --git a/treesource.c b/treesource.c
index 9cbf0a9..3c24e7f 100644
--- a/treesource.c
+++ b/treesource.c
@@ -32,7 +32,8 @@ struct boot_info *dt_from_source(const char *fname)
 	the_boot_info = NULL;
 	treesource_error = 0;
 
-	push_input_file(fname);
+	srcpos_file = dtc_open_file(fname, NULL);
+	yyin = srcpos_file->file;
 
 	if (yyparse() != 0)
 		return NULL;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/crosstoolchain/device-tree-compiler.git