X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/4cdb01db9b73ce7678584e70f41d6adb3c53fcd7..f7aed660541ed7b05c4d892334dfe64ba200a4a2:/src/reader.h

diff --git a/src/reader.h b/src/reader.h
index 29d95b1d..8792372e 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -21,54 +21,16 @@
 #ifndef READER_H_
 # define READER_H_
 
-typedef struct symbol_list
-{
-  struct symbol_list *next;
-  symbol_t *sym;
-  int line;
-
-  /* The action is attached to the LHS of a rule. */
-  const char *action;
-  int action_line;
-
-  symbol_t *ruleprec;
-} symbol_list;
-
+# include "symlist.h"
 # include "parse-gram.h"
 
-typedef int location_t;
-
-/* Initialize LOC. */
-# define LOCATION_RESET(Loc)                  \
-  (Loc).first_column = (Loc).first_line = 1;  \
-  (Loc).last_column =  (Loc).last_line = 1;
-
-/* Advance of NUM columns. */
-# define LOCATION_COLUMNS(Loc, Num)           \
-  (Loc).last_column += Num;
-
-/* Advance of NUM lines. */
-# define LOCATION_LINES(Loc, Num)             \
-  (Loc).last_column = 1;                      \
-  (Loc).last_line += Num;
-
-/* Restart: move the first cursor to the last position. */
-# define LOCATION_STEP(Loc)                   \
-  (Loc).first_column = (Loc).last_column;     \
-  (Loc).first_line = (Loc).last_line;
-
-/* Output LOC on the stream OUT. */
-# define LOCATION_PRINT(Out, Loc)                               \
-  fprintf (stderr, "%s:", infile);				\
-  if ((Loc).first_line != (Loc).last_line)                      \
-    fprintf (Out, "%d.%d-%d.%d",                                \
-             (Loc).first_line, (Loc).first_column,              \
-             (Loc).last_line, (Loc).last_column - 1);           \
-  else if ((Loc).first_column < (Loc).last_column - 1)          \
-    fprintf (Out, "%d.%d-%d", (Loc).first_line,                 \
-             (Loc).first_column, (Loc).last_column - 1);        \
-  else                                                          \
-    fprintf (Out, "%d.%d", (Loc).first_line, (Loc).first_column)
+typedef struct merger_list
+{
+  struct merger_list* next;
+  const char* name;
+  const char* type;
+}
+merger_list;
 
 typedef struct gram_control_s
 {
@@ -79,36 +41,57 @@ typedef struct gram_control_s
 extern FILE *gram_in;
 extern int gram__flex_debug;
 void scanner_last_string_free PARAMS ((void));
+void scanner_initialize PARAMS ((void));
 void scanner_free PARAMS ((void));
 
 # define YY_DECL \
-  int gram_lex (yystype *yylval, yyltype *yylloc, \
+  int gram_lex (yystype *yylval, location_t *yylloc, \
 		gram_control_t *yycontrol)
 YY_DECL;
 
 
 /* From the parser.  */
 extern int gram_debug;
-void gram_error (gram_control_t *control,
-		 yyltype *loc, const char *msg);
+void gram_error (location_t *loc, const char *msg);
 int gram_parse (void *control);
 
-char *get_type_name PARAMS ((int n, symbol_list *rule));
-extern int typed;
+/* The sort of braced code we are in.  */
+typedef enum braced_code_e
+  {
+    action_braced_code,
+    destructor_braced_code,
+    printer_braced_code
+  } braced_code_t;
+/* FIXME: This is really a dirty hack which demonstrates that we
+   should probably not try to parse the actions now.  */
+extern braced_code_t current_braced_code;
+
 
 /* From reader.c. */
-void grammar_start_symbol_set PARAMS ((symbol_t *s));
+void grammar_start_symbol_set PARAMS ((symbol_t *s, location_t l));
 void prologue_augment PARAMS ((const char *prologue, location_t location));
 void epilogue_set PARAMS ((const char *epilogue, location_t location));
-void grammar_symbol_append PARAMS ((symbol_t *s));
-void grammar_rule_begin PARAMS ((symbol_t *lhs));
-void grammar_rule_end PARAMS ((void));
+void grammar_symbol_append PARAMS ((symbol_t *s, location_t l));
+void grammar_rule_begin PARAMS ((symbol_t *lhs, location_t l));
+void grammar_rule_end PARAMS ((location_t l));
 void grammar_midrule_action PARAMS ((void));
-void grammar_current_rule_prec_set PARAMS ((symbol_t *precsym));
-void grammar_current_rule_symbol_append PARAMS ((symbol_t *symbol));
+void grammar_current_rule_prec_set PARAMS ((symbol_t *precsym,
+					    location_t l));
+void grammar_current_rule_dprec_set PARAMS ((int dprec,
+					    location_t l));
+void grammar_current_rule_merge_set PARAMS ((const char* name,
+					    location_t l));
+
+void grammar_current_rule_symbol_append PARAMS ((symbol_t *symbol,
+						 location_t l));
 void grammar_current_rule_action_append PARAMS ((const char *action,
-						 int line));
-extern symbol_list *current_rule;
+						 location_t l));
+extern symbol_list_t *current_rule;
 void reader PARAMS ((void));
+void free_merger_functions PARAMS ((void));
+
+extern merger_list *merge_functions;
+
+extern int typed;
 
 #endif /* !READER_H_ */