From ef4a69fcdb62cf3ff0aaa6d73af7864b8f640d33 Mon Sep 17 00:00:00 2001
From: "ben.franksen" <ben.franksen@online.de>
Date: Tue, 29 Mar 2011 15:43:00 +0000
Subject: [PATCH] snc: finally did some overdue file name changes
---
src/snc/Makefile | 4 ++--
src/snc/analysis.c | 4 ++--
src/snc/{parse.c => expr.c} | 4 ++--
src/snc/{parse.h => expr.h} | 0
src/snc/gen_code.c | 2 +-
src/snc/gen_ss_code.c | 4 ++--
src/snc/gen_tables.c | 4 ++--
src/snc/{snc_main.c => main.c} | 4 ++--
src/snc/{snc_main.h => main.h} | 0
src/snc/{lexer.h => parser.h} | 7 +++----
src/snc/snl.lem | 6 +++---
src/snc/snl.re | 4 ++--
src/snc/var_types.c | 4 ++--
13 files changed, 23 insertions(+), 24 deletions(-)
rename src/snc/{parse.c => expr.c} (98%)
rename src/snc/{parse.h => expr.h} (100%)
rename src/snc/{snc_main.c => main.c} (99%)
rename src/snc/{snc_main.h => main.h} (100%)
rename src/snc/{lexer.h => parser.h} (89%)
diff --git a/src/snc/Makefile b/src/snc/Makefile
index 7be0eebf..5e42dfeb 100644
--- a/src/snc/Makefile
+++ b/src/snc/Makefile
@@ -33,8 +33,8 @@ snc_LIBS += $(EPICS_BASE_IOC_LIBS)
snc_SRCS += lexer.c # generated by re2c
snc_SRCS += snl.c # generated by lemon
-snc_SRCS += snc_main.c # main program
-snc_SRCS += parse.c # parse routines
+snc_SRCS += main.c # main program
+snc_SRCS += expr.c # generate expressions
snc_SRCS += var_types.c # declarations
snc_SRCS += analysis.c # analysis routines
snc_SRCS += gen_code.c # code generation
diff --git a/src/snc/analysis.c b/src/snc/analysis.c
index c9536824..f31dee5b 100644
--- a/src/snc/analysis.c
+++ b/src/snc/analysis.c
@@ -16,8 +16,8 @@
#include "types.h"
#include "sym_table.h"
-#include "snc_main.h"
-#include "parse.h"
+#include "main.h"
+#include "expr.h"
#include "analysis.h"
static const int impossible = 0;
diff --git a/src/snc/parse.c b/src/snc/expr.c
similarity index 98%
rename from src/snc/parse.c
rename to src/snc/expr.c
index 5197aead..31ef7d03 100644
--- a/src/snc/parse.c
+++ b/src/snc/expr.c
@@ -20,8 +20,8 @@
#define expr_type_GLOBAL
#include "types.h"
#undef expr_type_GLOBAL
-#include "parse.h"
-#include "snc_main.h"
+#include "expr.h"
+#include "main.h"
/* Expr is the generic syntax tree node */
Expr *expr(
diff --git a/src/snc/parse.h b/src/snc/expr.h
similarity index 100%
rename from src/snc/parse.h
rename to src/snc/expr.h
diff --git a/src/snc/gen_code.c b/src/snc/gen_code.c
index 5db7cc1d..986d7ac2 100644
--- a/src/snc/gen_code.c
+++ b/src/snc/gen_code.c
@@ -17,7 +17,7 @@
#include "analysis.h"
#include "gen_ss_code.h"
#include "gen_tables.h"
-#include "snc_main.h"
+#include "main.h"
#include "gen_code.h"
static void gen_preamble(char *prog_name);
diff --git a/src/snc/gen_ss_code.c b/src/snc/gen_ss_code.c
index 53938c77..f3815265 100644
--- a/src/snc/gen_ss_code.c
+++ b/src/snc/gen_ss_code.c
@@ -13,10 +13,10 @@
#include <string.h>
#include <assert.h>
-#include "parse.h"
+#include "expr.h"
#include "analysis.h"
#include "gen_code.h"
-#include "snc_main.h"
+#include "main.h"
#include "sym_table.h"
#include "gen_ss_code.h"
diff --git a/src/snc/gen_tables.c b/src/snc/gen_tables.c
index b4a7064a..898f96ac 100644
--- a/src/snc/gen_tables.c
+++ b/src/snc/gen_tables.c
@@ -16,10 +16,10 @@
#include "seqCom.h"
#include "analysis.h"
-#include "snc_main.h"
+#include "main.h"
#include "sym_table.h"
#include "gen_code.h"
-#include "parse.h"
+#include "expr.h"
#include "gen_tables.h"
typedef struct event_mask_args {
diff --git a/src/snc/snc_main.c b/src/snc/main.c
similarity index 99%
rename from src/snc/snc_main.c
rename to src/snc/main.c
index a1160807..cbf0a2da 100644
--- a/src/snc/snc_main.c
+++ b/src/snc/main.c
@@ -15,10 +15,10 @@
#include <stdarg.h>
#include "types.h"
-#include "lexer.h"
+#include "parser.h"
#include "analysis.h"
#include "gen_code.h"
-#include "snc_main.h"
+#include "main.h"
#include <seqVersion.h>
diff --git a/src/snc/snc_main.h b/src/snc/main.h
similarity index 100%
rename from src/snc/snc_main.h
rename to src/snc/main.h
diff --git a/src/snc/lexer.h b/src/snc/parser.h
similarity index 89%
rename from src/snc/lexer.h
rename to src/snc/parser.h
index 92487bcc..90e224ce 100644
--- a/src/snc/lexer.h
+++ b/src/snc/parser.h
@@ -4,10 +4,9 @@
(see file Copyright.HZB included in this distribution)
***************************************************************************
Interface to lemon generated parser
- TODO: should rename this file
***************************************************************************/
-#ifndef INCLlexerh
-#define INCLlexerh
+#ifndef INCLparserh
+#define INCLparserh
#include "types.h"
@@ -29,4 +28,4 @@ void snlParserFree(
void snlParserTrace(FILE *TraceFILE, char *zTracePrompt);
-#endif /*INCLlexerh*/
+#endif /*INCLparserh*/
diff --git a/src/snc/snl.lem b/src/snc/snl.lem
index 19847074..c204e241 100644
--- a/src/snc/snl.lem
+++ b/src/snc/snl.lem
@@ -10,9 +10,9 @@
#include <string.h>
#include <assert.h>
-#include "parse.h"
-#include "snc_main.h"
-#include "lexer.h"
+#include "expr.h"
+#include "main.h"
+#include "parser.h"
}
%extra_argument { Expr **presult }
diff --git a/src/snc/snl.re b/src/snc/snl.re
index a0639b3b..9a3bd648 100644
--- a/src/snc/snl.re
+++ b/src/snc/snl.re
@@ -12,8 +12,8 @@
#include <stdarg.h>
#include "snl.h"
-#include "snc_main.h"
-#include "lexer.h"
+#include "main.h"
+#include "parser.h"
#define EOI 0
diff --git a/src/snc/var_types.c b/src/snc/var_types.c
index a92a4eca..940969e4 100644
--- a/src/snc/var_types.c
+++ b/src/snc/var_types.c
@@ -7,8 +7,8 @@
#include <stdlib.h>
#include <stdio.h>
-#include "snc_main.h"
-#include "parse.h"
+#include "main.h"
+#include "expr.h"
/* #define DEBUG */
--
GitLab