Skip to contentSkip to conversation

genksyms: make source_file a local variable in lexer

PATCH New Masahiro Yamada 1 participant 3 messages Jan 15, 2021 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 genksyms: make source_file a local variable in lexer

This is only used in yylex() in lex.l

---

 scripts/genksyms/genksyms.c | 2 +-
 scripts/genksyms/genksyms.h | 2 +-
 scripts/genksyms/lex.l      | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
scripts/genksyms/genksyms.c +1 -1
index 23eff234184f..4827c5abe5b7 100644
@@ -29,7 +29,7 @@ static struct symbol *symtab[HASH_BUCKETS];
 static FILE *debugfile;
 
 int cur_line = 1;
-char *cur_filename, *source_file;
+char *cur_filename;
 int in_source_file;
 
 static int flag_debug, flag_dump_defs, flag_reference, flag_dump_types,
scripts/genksyms/genksyms.h +1 -1
index 2bcdb9bebab4..21ed2ec2d98c 100644
@@ -47,7 +47,7 @@ typedef struct string_list **yystype;
 #define YYSTYPE yystype
 
 extern int cur_line;
-extern char *cur_filename, *source_file;
+extern char *cur_filename;
 extern int in_source_file;
 
 struct symbol *find_symbol(const char *name, enum symbol_type ns, int exact);
scripts/genksyms/lex.l +1 -0
index ae76472efc43..9e88c100fc28 100644
@@ -125,6 +125,7 @@ yylex(void)
 
   static int suppress_type_lookup, dont_want_brace_phrase;
   static struct string_list *next_node;
+  static char *source_file;
 
   int token, count = 0;
   struct string_list *cur_node;
Signature · 1 line
2.27.0
#1 lore raw

PATCH 2/3 genksyms: remove dead code for ST_TABLE_*

No one sets lexstate to ST_TABLE_*. It is is very old code, and I do not know what was the plan at that time. Let's remove the dead code.

---

 scripts/genksyms/lex.l | 54 ------------------------------------------
 1 file changed, 54 deletions(-)
scripts/genksyms/lex.l +0 -54
index 9e88c100fc28..9cb075cf6a34 100644
@@ -119,8 +119,6 @@ yylex(void)
   static enum {
     ST_NOTSTARTED, ST_NORMAL, ST_ATTRIBUTE, ST_ASM, ST_TYPEOF, ST_TYPEOF_1,
     ST_BRACKET, ST_BRACE, ST_EXPRESSION, ST_STATIC_ASSERT,
-    ST_TABLE_1, ST_TABLE_2, ST_TABLE_3, ST_TABLE_4,
-    ST_TABLE_5, ST_TABLE_6
   } lexstate = ST_NOTSTARTED;
 
   static int suppress_type_lookup, dont_want_brace_phrase;
@@ -427,58 +425,6 @@ repeat:
 	}
       break;
 
-    case ST_TABLE_1:
-      goto repeat;
-
-    case ST_TABLE_2:
-      if (token == IDENT && yyleng == 1 && yytext[0] == 'X')
-	{
-	  token = EXPORT_SYMBOL_KEYW;
-	  lexstate = ST_TABLE_5;
-	  APP;
-	  break;
-	}
-      lexstate = ST_TABLE_6;
-      /* FALLTHRU */
-
-    case ST_TABLE_6:
-      switch (token)
-	{
-	case '{': case '[': case '(':
-	  ++count;
-	  break;
-	case '}': case ']': case ')':
-	  --count;
-	  break;
-	case ',':
-	  if (count == 0)
-	    lexstate = ST_TABLE_2;
-	  break;
-	};
-      goto repeat;
-
-    case ST_TABLE_3:
-      goto repeat;
-
-    case ST_TABLE_4:
-      if (token == ';')
-	lexstate = ST_NORMAL;
-      goto repeat;
-
-    case ST_TABLE_5:
-      switch (token)
-	{
-	case ',':
-	  token = ';';
-	  lexstate = ST_TABLE_2;
-	  APP;
-	  break;
-	default:
-	  APP;
-	  break;
-	}
-      break;
-
     default:
       exit(1);
     }
Signature · 1 line
2.27.0
#2 lore raw

PATCH 3/3 genksyms: remove useless case DOTS

In reply to Masahiro Yamada

This switch statement does not list out all the cases. Since the 'default' covers all the rest, the 'DOTS' case is unneeded.

---

 scripts/genksyms/lex.l | 1 -
 1 file changed, 1 deletion(-)
scripts/genksyms/lex.l +0 -1
index 9cb075cf6a34..a4d7495eaf75 100644
@@ -234,7 +234,6 @@ repeat:
 	  lexstate = ST_EXPRESSION;
 	  break;
 
-	case DOTS:
 	default:
 	  APP;
 	  break;
Signature · 1 line
2.27.0