[PATCH 1/2] kconfig: rename zconf.l to lexer.l

[PATCH 1/2] kconfig: rename zconf.l to lexer.l

[Masahiro Yamada]

Use a more logcal name.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 scripts/kconfig/Makefile             | 6 +++---
 scripts/kconfig/{zconf.l => lexer.l} | 0
 scripts/kconfig/lkc.h                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename scripts/kconfig/{zconf.l => lexer.l} (100%)

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 1819735..9278519 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -143,10 +143,10 @@ help:
 
 # ===========================================================================
 # object files used by all kconfig flavours
-common-objs	:= confdata.o expr.o symbol.o preprocess.o zconf.lex.o zconf.tab.o
+common-objs	:= confdata.o expr.o lexer.lex.o preprocess.o symbol.o zconf.tab.o
 
-$(obj)/zconf.lex.o: $(obj)/zconf.tab.h
-HOSTCFLAGS_zconf.lex.o	:= -I$(src)
+$(obj)/lexer.lex.o: $(obj)/zconf.tab.h
+HOSTCFLAGS_lexer.lex.o	:= -I$(src)
 HOSTCFLAGS_zconf.tab.o	:= -I$(src)
 
 # conf: Used for defconfig, oldconfig and related targets
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/lexer.l
similarity index 100%
rename from scripts/kconfig/zconf.l
rename to scripts/kconfig/lexer.l
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index 531ff7c..d871539 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -90,7 +90,7 @@ void *xrealloc(void *p, size_t size);
 char *xstrdup(const char *s);
 char *xstrndup(const char *s, size_t n);
 
-/* zconf.l */
+/* lexer.l */
 int yylex(void);
 
 struct gstr {
-- 
2.7.4

[PATCH 2/2] kconfig: rename zconf.y to parser.y

[Masahiro Yamada]

Use a more logical name.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 scripts/kconfig/Makefile              | 7 ++++---
 scripts/kconfig/expr.h                | 2 +-
 scripts/kconfig/lexer.l               | 2 +-
 scripts/kconfig/{zconf.y => parser.y} | 0
 4 files changed, 6 insertions(+), 5 deletions(-)
 rename scripts/kconfig/{zconf.y => parser.y} (100%)

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 9278519..7c5dc31 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -143,11 +143,12 @@ help:
 
 # ===========================================================================
 # object files used by all kconfig flavours
-common-objs	:= confdata.o expr.o lexer.lex.o preprocess.o symbol.o zconf.tab.o
+common-objs	:= confdata.o expr.o lexer.lex.o parser.tab.o preprocess.o \
+		   symbol.o
 
-$(obj)/lexer.lex.o: $(obj)/zconf.tab.h
+$(obj)/lexer.lex.o: $(obj)/parser.tab.h
 HOSTCFLAGS_lexer.lex.o	:= -I$(src)
-HOSTCFLAGS_zconf.tab.o	:= -I$(src)
+HOSTCFLAGS_parser.tab.o	:= -I$(src)
 
 # conf: Used for defconfig, oldconfig and related targets
 hostprogs-y	+= conf
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 999edb6..8dde65bc 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -172,7 +172,7 @@ struct symbol {
  *         int "BAZ Value"
  *         range 1..255
  *
- * Please, also check zconf.y:print_symbol() when modifying the
+ * Please, also check parser.y:print_symbol() when modifying the
  * list of property types!
  */
 enum prop_type {
diff --git a/scripts/kconfig/lexer.l b/scripts/kconfig/lexer.l
index b2d0a3b..c9df1c8 100644
--- a/scripts/kconfig/lexer.l
+++ b/scripts/kconfig/lexer.l
@@ -15,7 +15,7 @@
 #include <unistd.h>
 
 #include "lkc.h"
-#include "zconf.tab.h"
+#include "parser.tab.h"
 
 #define YY_DECL		static int yylex1(void)
 
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/parser.y
similarity index 100%
rename from scripts/kconfig/zconf.y
rename to scripts/kconfig/parser.y
-- 
2.7.4

Re: [PATCH 1/2] kconfig: rename zconf.l to lexer.l

[Masahiro Yamada]

On Thu, Jan 24, 2019 at 7:48 PM Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
>
> Use a more logcal name.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---


Both, applied to linux-kbuild/kconfig.






-- 
Best Regards
Masahiro Yamada