Rename ebnf dialect to iso-ebnf.

katef · Feb 24, 2018 · 94137d5 · 94137d5
1 parent 556dacf
commit 94137d5
Show file tree

Hide file tree

Showing 17 changed files with 74 additions and 71 deletions.
diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ PREFIX ?= /usr/local
 SUBDIR += src/bnf
 SUBDIR += src/dot
 SUBDIR += src/abnf
-SUBDIR += src/ebnf
+SUBDIR += src/iso-ebnf
 SUBDIR += src/rbnf
 SUBDIR += src/sid
 SUBDIR += src/wsn

diff --git a/examples/expr-minus.ebnf → examples/expr-minus.iso-ebnf b/examples/expr-minus.ebnf → examples/expr-minus.iso-ebnf
diff --git a/examples/json.ebnf → examples/json.iso-ebnf b/examples/json.ebnf → examples/json.iso-ebnf
diff --git a/src/Makefile b/src/Makefile
@@ -15,7 +15,7 @@ ${BUILD}/bin/kgt: ${BUILD}/src/ast.o
 ${BUILD}/bin/kgt: ${BUILD}/src/main.o
 ${BUILD}/bin/kgt: ${BUILD}/src/xalloc.o
 
-.for part in ${PART:Mbnf} ${PART:Mabnf} ${PART:Mebnf} ${PART:Mrbnf} \
+.for part in ${PART:Mbnf} ${PART:Mabnf} ${PART:Miso-ebnf} ${PART:Mrbnf} \
 	${PART:Msid} ${PART:Mdot} ${PART:Mwsn} \
 	${PART:Mrrd} ${PART:Mrrdot} ${PART:Mrrdump} \
 	${PART:Mrrparcon} ${PART:Mrrta} ${PART:Mrrtext}

diff --git a/src/ebnf/Makefile b/src/ebnf/Makefile
diff --git a/src/ebnf/io.h b/src/ebnf/io.h
diff --git a/src/iso-ebnf/Makefile b/src/iso-ebnf/Makefile
@@ -0,0 +1,34 @@
+.include "../../share/mk/top.mk"
+
+SRC += src/iso-ebnf/lexer.c
+SRC += src/iso-ebnf/parser.c
+SRC += src/iso-ebnf/output.c
+
+LEXER  += src/iso-ebnf/lexer.lx
+PARSER += src/iso-ebnf/parser.sid
+
+PART += iso-ebnf
+
+.for src in ${LEXER:Msrc/iso-ebnf/lexer.lx}
+LX_CFLAGS.${src} += -b dyn -e lx_iso_ebnf_ -t TOK_
+.endfor
+
+.for parser in ${PARSER:Msrc/iso-ebnf/parser.sid}
+ACT.${parser} = src/parser.act
+.endfor
+
+.for src in ${SRC:Msrc/iso-ebnf/lexer.c}
+CFLAGS.${src} += -D LX_HEADER='"lexer.h"'
+DFLAGS.${src} += -D LX_HEADER='"lexer.h"'
+.endfor
+
+.for src in ${SRC:Msrc/iso-ebnf/parser.c}
+CFLAGS.${src} += -D FORM='iso_ebnf'
+DFLAGS.${src} += -D FORM='iso_ebnf'
+.endfor
+
+.for src in ${SRC:Msrc/iso-ebnf/*.c}
+${BUILD}/lib/iso-ebnf.o:    ${BUILD}/${src:R}.o
+${BUILD}/lib/iso-ebnf.opic: ${BUILD}/${src:R}.opic
+.endfor
+
diff --git a/src/iso-ebnf/io.h b/src/iso-ebnf/io.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014-2017 Katherine Flavel
+ *
+ * See LICENCE for the full copyright terms.
+ */
+
+#ifndef KGT_ISO_EBNF_IO_H
+#define KGT_ISO_EBNF_IO_H
+
+struct ast_rule;
+
+struct ast_rule *
+iso_ebnf_input(int (*f)(void *opaque), void *opaque);
+
+void
+iso_ebnf_output(const struct ast_rule *grammar);
+
+#endif
+
diff --git a/src/ebnf/lexer.c → src/iso-ebnf/lexer.c b/src/ebnf/lexer.c → src/iso-ebnf/lexer.c
diff --git a/src/ebnf/lexer.h → src/iso-ebnf/lexer.h b/src/ebnf/lexer.h → src/iso-ebnf/lexer.h
diff --git a/src/ebnf/lexer.lx → src/iso-ebnf/lexer.lx b/src/ebnf/lexer.lx → src/iso-ebnf/lexer.lx
diff --git a/src/ebnf/output.c → src/iso-ebnf/output.c b/src/ebnf/output.c → src/iso-ebnf/output.c
@@ -155,7 +155,7 @@ output_rule(const struct ast_rule *rule)
 }
 
 void
-ebnf_output(const struct ast_rule *grammar)
+iso_ebnf_output(const struct ast_rule *grammar)
 {
 	const struct ast_rule *p;
 

diff --git a/src/ebnf/parser.c → src/iso-ebnf/parser.c b/src/ebnf/parser.c → src/iso-ebnf/parser.c
diff --git a/src/ebnf/parser.h → src/iso-ebnf/parser.h b/src/ebnf/parser.h → src/iso-ebnf/parser.h
diff --git a/src/ebnf/parser.sid → src/iso-ebnf/parser.sid b/src/ebnf/parser.sid → src/iso-ebnf/parser.sid
@@ -223,7 +223,7 @@
 		<add-rule-to-list>(r, l);
 	};
 
-	ebnf: () -> (l :ast_rule) = {
+	iso-ebnf: () -> (l :ast_rule) = {
 		l = list-of-rules;
 		EOF;
 	##
@@ -233,5 +233,5 @@
 
 %entry%
 
-	ebnf;
+	iso-ebnf;
 
diff --git a/src/main.c b/src/main.c
@@ -16,7 +16,7 @@
 #include "bnf/io.h"
 #include "wsn/io.h"
 #include "abnf/io.h"
-#include "ebnf/io.h"
+#include "iso-ebnf/io.h"
 #include "rbnf/io.h"
 #include "sid/io.h"
 #include "dot/io.h"
@@ -37,18 +37,18 @@ struct io {
 	struct ast_rule *(*in)(int (*f)(void *), void *);
 	void (*out)(const struct ast_rule *);
 } io[] = {
-	{ "bnf",      bnf_input,  bnf_output      },
-	{ "wsn",      wsn_input,  wsn_output      },
-	{ "abnf",     abnf_input, NULL            },
-	{ "ebnf",     ebnf_input, ebnf_output     },
-	{ "rbnf",     rbnf_input, rbnf_output     },
-	{ "sid",      NULL,       sid_output      },
-	{ "dot",      NULL,       dot_output      },
-	{ "rrdot",    NULL,       rrdot_output    },
-	{ "rrdump",   NULL,       rrdump_output   },
-	{ "rrparcon", NULL,       rrparcon_output },
-	{ "rrta",     NULL,       rrta_output     },
-	{ "rrtext",   NULL,       rrtext_output   }
+	{ "bnf",      bnf_input,      bnf_output      },
+	{ "wsn",      wsn_input,      wsn_output      },
+	{ "abnf",     abnf_input,     NULL            },
+	{ "iso-ebnf", iso_ebnf_input, iso_ebnf_output },
+	{ "rbnf",     rbnf_input,     rbnf_output     },
+	{ "sid",      NULL,           sid_output      },
+	{ "dot",      NULL,           dot_output      },
+	{ "rrdot",    NULL,           rrdot_output    },
+	{ "rrdump",   NULL,           rrdump_output   },
+	{ "rrparcon", NULL,           rrparcon_output },
+	{ "rrta",     NULL,           rrta_output     },
+	{ "rrtext",   NULL,           rrtext_output   }
 };
 
 enum io_dir {

diff --git a/src/parser.act b/src/parser.act
@@ -61,6 +61,9 @@
 	/* XXX: get rid of this; use same %entry% for all grammars */
 	#define FORM_ENTRY CAT(prod_, FORM)
 
+	/* XXX: workaround for SID's identifier escaping */
+	#define prod_iso_Hebnf FORM_ENTRY
+
 	#include "parser.h"
 	#include "lexer.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -155,7 +155,7 @@ output_rule(const struct ast_rule *rule) @@
     }
     void
-    ebnf_output(const struct ast_rule *grammar)
+    iso_ebnf_output(const struct ast_rule *grammar)
     {
     	const struct ast_rule *p;
@@ Expand Down @@