X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/95e36146a5be4c921c14f82ab80e3612866c4518..131e2fef683836d45262423bbdf004a014335aba:/src/reader.c?ds=sidebyside

diff --git a/src/reader.c b/src/reader.c
index b22f42d1..cdacc071 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -31,8 +31,7 @@
 #include "output.h"
 #include "reader.h"
 #include "conflicts.h"
-
-extern char *printable_version PARAMS ((int));
+#include "quote.h"
 
 /* Number of slots allocated (but not necessarily used yet) in `rline'  */
 static int rline_allocated;
@@ -67,9 +66,6 @@ static int gensym_count;
 
 static bucket *errtoken;
 static bucket *undeftoken;
-
-/* Nonzero if any action or guard uses the @n construct.  */
-static int yylsp_needed;
 
 
 /*===================\
@@ -121,6 +117,40 @@ read_signed_integer (FILE *stream)
   return sign * n;
 }
 
+/*--------------------------------------------------------------.
+| Get the data type (alternative in the union) of the value for |
+| symbol N in rule RULE.                                        |
+`--------------------------------------------------------------*/
+
+static char *
+get_type_name (int n, symbol_list * rule)
+{
+  int i;
+  symbol_list *rp;
+
+  if (n < 0)
+    {
+      complain (_("invalid $ value"));
+      return NULL;
+    }
+
+  rp = rule;
+  i = 0;
+
+  while (i < n)
+    {
+      rp = rp->next;
+      if (rp == NULL || rp->sym == NULL)
+	{
+	  complain (_("invalid $ value"));
+	  return NULL;
+	}
+      i++;
+    }
+
+  return rp->sym->type_name;
+}
+
 /*-------------------------------------------------------------------.
 | Dump the string from FINPUT to FOUTPUT.  MATCH is the delimiter of |
 | the string (either ' or ").                                        |
@@ -256,7 +286,7 @@ copy_at (FILE *fin, FILE *fout, int stack_offset)
   if (c == '$')
     {
       fprintf (fout, "yyloc");
-      yylsp_needed = 1;
+      locations_flag = 1;
     }
   else if (isdigit (c) || c == '-')
     {
@@ -266,10 +296,86 @@ copy_at (FILE *fin, FILE *fout, int stack_offset)
       n = read_signed_integer (fin);
 
       fprintf (fout, "yylsp[%d]", n - stack_offset);
-      yylsp_needed = 1;
+      locations_flag = 1;
     }
   else
-    complain (_("@%s is invalid"), printable_version (c));
+    {
+      char buf[] = "@c";
+      buf[1] = c;
+      complain (_("%s is invalid"), quote (buf));
+    }
+}
+
+
+/*-------------------------------------------------------------------.
+| FIN is pointing to a wannabee semantic value (i.e., a `$').        |
+|                                                                    |
+| Possible inputs: $[<TYPENAME>]($|integer)                          |
+|                                                                    |
+| Output to FOUT a reference to this semantic value. STACK_OFFSET is |
+| the number of values in the current rule so far, which says where  |
+| to find `$0' with respect to the top of the stack.                 |
+`-------------------------------------------------------------------*/
+
+static inline void
+copy_dollar (FILE *fin, FILE *fout,
+	     symbol_list *rule, int stack_offset)
+{
+  int c = getc (fin);
+  char *type_name = NULL;
+
+  /* Get the typename if explicit. */
+  if (c == '<')
+    {
+      char *cp = token_buffer;
+
+      while ((c = getc (fin)) != '>' && c > 0)
+	{
+	  if (cp == token_buffer + maxtoken)
+	    cp = grow_token_buffer (cp);
+
+	  *cp++ = c;
+	}
+      *cp = 0;
+      type_name = token_buffer;
+      value_components_used = 1;
+
+      c = getc (fin);
+    }
+
+  if (c == '$')
+    {
+      fprintf (fout, "yyval");
+      if (!type_name)
+	type_name = get_type_name (0, rule);
+      if (type_name)
+	fprintf (fout, ".%s", type_name);
+      if (!type_name && typed)
+	complain (_("$$ of `%s' has no declared type"),
+		  rule->sym->tag);
+    }
+  else if (isdigit (c) || c == '-')
+    {
+      int n;
+      ungetc (c, fin);
+      n = read_signed_integer (fin);
+
+      if (!type_name && n > 0)
+	type_name = get_type_name (n, rule);
+
+      fprintf (fout, "yyvsp[%d]", n - stack_offset);
+      if (type_name)
+	fprintf (fout, ".%s", type_name);
+      if (!type_name && typed)
+	complain (_("$%d of `%s' has no declared type"),
+		  n, rule->sym->tag);
+    }
+  else
+    {
+      char buf[] = "$c";
+      buf[1] = c;
+      complain (_("%s is invalid"), quote (buf));
+    }
 }
 
 /*-------------------------------------------------------------------.
@@ -284,7 +390,7 @@ copy_definition (void)
   /* -1 while reading a character if prev char was %. */
   int after_percent;
 
-  if (!nolinesflag)
+  if (!no_lines_flag)
     fprintf (fattrs, "#line %d \"%s\"\n", lineno, infile);
 
   after_percent = 0;
@@ -375,17 +481,25 @@ parse_token_decl (symbol_class what_is, symbol_class what_is_not)
 	}
       else if (token == IDENTIFIER && *symval->tag == '\"' && symbol)
 	{
+	  if (symval->alias)
+	    warn (_("symbol `%s' used more than once as a literal string"),
+		  symval->tag);
+	  else if (symbol->alias)
+	    warn (_("symbol `%s' given more than one literal string"),
+		  symbol->tag);
+	  else
+	    {
+	      symval->class = token_sym;
+	      symval->type_name = typename;
+	      symval->user_token_number = symbol->user_token_number;
+	      symbol->user_token_number = SALIAS;
+	      symval->alias = symbol;
+	      symbol->alias = symval;
+	      /* symbol and symval combined are only one symbol */
+	      nsyms--;
+	    }
 	  translations = 1;
-	  symval->class = token_sym;
-	  symval->type_name = typename;
-	  symval->user_token_number = symbol->user_token_number;
-	  symbol->user_token_number = SALIAS;
-
-	  symval->alias = symbol;
-	  symbol->alias = symval;
-	  symbol = NULL;
-
-	  nsyms--;		/* symbol and symval combined are only one symbol */
+ 	  symbol = NULL;
 	}
       else if (token == IDENTIFIER)
 	{
@@ -440,43 +554,6 @@ parse_start_decl (void)
     }
 }
 
-
-
-/*--------------------------------------------------------------.
-| Get the data type (alternative in the union) of the value for |
-| symbol n in rule rule.                                        |
-`--------------------------------------------------------------*/
-
-static char *
-get_type_name (int n, symbol_list * rule)
-{
-  int i;
-  symbol_list *rp;
-
-  if (n < 0)
-    {
-      complain (_("invalid $ value"));
-      return NULL;
-    }
-
-  rp = rule;
-  i = 0;
-
-  while (i < n)
-    {
-      rp = rp->next;
-      if (rp == NULL || rp->sym == NULL)
-	{
-	  complain (_("invalid $ value"));
-	  return NULL;
-	}
-      i++;
-    }
-
-  return rp->sym->type_name;
-}
-
-
 /*-----------------------------------------------------------.
 | read in a %type declaration and record its information for |
 | get_type_name to access                                    |
@@ -631,7 +708,7 @@ parse_union_decl (void)
 
   typed = 1;
 
-  if (!nolinesflag)
+  if (!no_lines_flag)
     fprintf (fattrs, "\n#line %d \"%s\"\n", lineno, infile);
   else
     fprintf (fattrs, "\n");
@@ -696,28 +773,13 @@ parse_union_decl (void)
 static void
 parse_expect_decl (void)
 {
-  int c;
-  int count;
-  char buffer[20];
-
-  c = getc (finput);
-  while (c == ' ' || c == '\t')
-    c = getc (finput);
-
-  count = 0;
-  while (c >= '0' && c <= '9')
-    {
-      if (count < 20)
-	buffer[count++] = c;
-      c = getc (finput);
-    }
-  buffer[count] = 0;
-
+  int c = skip_white_space ();
   ungetc (c, finput);
 
-  if (count <= 0 || count > 10)
-    complain ("%s", _("argument of %expect is not an integer"));
-  expected_conflicts = atoi (buffer);
+  if (!isdigit (c))
+    complain (_("argument of %%expect is not an integer"));
+  else
+    expected_conflicts = read_signed_integer (finput);
 }
 
 
@@ -797,7 +859,8 @@ parse_thong_decl (void)
   symval->alias = symbol;
   symbol->alias = symval;
 
-  nsyms--;			/* symbol and symval combined are only one symbol */
+  /* symbol and symval combined are only one symbol.  */
+  nsyms--;
 }
 
 
@@ -893,7 +956,9 @@ read_declarations (void)
 	fatal (_("no input grammar"));
       else
 	{
-	  complain (_("unknown character: %s"), printable_version (c));
+	  char buf[] = "c";
+	  buf[0] = c;
+	  complain (_("unknown character: %s"), quote (buf));
 	  skip_to_char ('%');
 	}
     }
@@ -907,19 +972,17 @@ read_declarations (void)
 `-------------------------------------------------------------------*/
 
 static void
-copy_action (symbol_list * rule, int stack_offset)
+copy_action (symbol_list *rule, int stack_offset)
 {
   int c;
-  int n;
   int count;
-  char *type_name;
 
   /* offset is always 0 if parser has already popped the stack pointer */
   if (semantic_parser)
     stack_offset = 0;
 
   fprintf (faction, "\ncase %d:\n", nrules);
-  if (!nolinesflag)
+  if (!no_lines_flag)
     fprintf (faction, "#line %d \"%s\"\n", lineno, infile);
   putc ('{', faction);
 
@@ -956,57 +1019,7 @@ copy_action (symbol_list * rule, int stack_offset)
 	      break;
 
 	    case '$':
-	      c = getc (finput);
-	      type_name = NULL;
-
-	      if (c == '<')
-		{
-		  char *cp = token_buffer;
-
-		  while ((c = getc (finput)) != '>' && c > 0)
-		    {
-		      if (cp == token_buffer + maxtoken)
-			cp = grow_token_buffer (cp);
-
-		      *cp++ = c;
-		    }
-		  *cp = 0;
-		  type_name = token_buffer;
-		  value_components_used = 1;
-
-		  c = getc (finput);
-		}
-	      if (c == '$')
-		{
-		  fprintf (faction, "yyval");
-		  if (!type_name)
-		    type_name = get_type_name (0, rule);
-		  if (type_name)
-		    fprintf (faction, ".%s", type_name);
-		  if (!type_name && typed)
-		    complain (_("$$ of `%s' has no declared type"),
-			      rule->sym->tag);
-		}
-	      else if (isdigit (c) || c == '-')
-		{
-		  ungetc (c, finput);
-		  n = read_signed_integer (finput);
-		  c = getc (finput);
-
-		  if (!type_name && n > 0)
-		    type_name = get_type_name (n, rule);
-
-		  fprintf (faction, "yyvsp[%d]", n - stack_offset);
-		  if (type_name)
-		    fprintf (faction, ".%s", type_name);
-		  if (!type_name && typed)
-		    complain (_("$%d of `%s' has no declared type"),
-			      n, rule->sym->tag);
-		  continue;
-		}
-	      else
-		complain (_("$%s is invalid"), printable_version (c));
-
+	      copy_dollar (finput, faction, rule, stack_offset);
 	      break;
 
 	    case '@':
@@ -1045,12 +1058,10 @@ copy_action (symbol_list * rule, int stack_offset)
 `-------------------------------------------------------------------*/
 
 static void
-copy_guard (symbol_list * rule, int stack_offset)
+copy_guard (symbol_list *rule, int stack_offset)
 {
   int c;
-  int n;
   int count;
-  char *type_name;
   int brace_flag = 0;
 
   /* offset is always 0 if parser has already popped the stack pointer */
@@ -1058,7 +1069,7 @@ copy_guard (symbol_list * rule, int stack_offset)
     stack_offset = 0;
 
   fprintf (fguard, "\ncase %d:\n", nrules);
-  if (!nolinesflag)
+  if (!no_lines_flag)
     fprintf (fguard, "#line %d \"%s\"\n", lineno, infile);
   putc ('{', fguard);
 
@@ -1105,56 +1116,7 @@ copy_guard (symbol_list * rule, int stack_offset)
 	  break;
 
 	case '$':
-	  c = getc (finput);
-	  type_name = NULL;
-
-	  if (c == '<')
-	    {
-	      char *cp = token_buffer;
-
-	      while ((c = getc (finput)) != '>' && c > 0)
-		{
-		  if (cp == token_buffer + maxtoken)
-		    cp = grow_token_buffer (cp);
-
-		  *cp++ = c;
-		}
-	      *cp = 0;
-	      type_name = token_buffer;
-
-	      c = getc (finput);
-	    }
-
-	  if (c == '$')
-	    {
-	      fprintf (fguard, "yyval");
-	      if (!type_name)
-		type_name = rule->sym->type_name;
-	      if (type_name)
-		fprintf (fguard, ".%s", type_name);
-	      if (!type_name && typed)
-		complain (_("$$ of `%s' has no declared type"),
-			  rule->sym->tag);
-	    }
-	  else if (isdigit (c) || c == '-')
-	    {
-	      ungetc (c, finput);
-	      n = read_signed_integer (finput);
-	      c = getc (finput);
-
-	      if (!type_name && n > 0)
-		type_name = get_type_name (n, rule);
-
-	      fprintf (fguard, "yyvsp[%d]", n - stack_offset);
-	      if (type_name)
-		fprintf (fguard, ".%s", type_name);
-	      if (!type_name && typed)
-		complain (_("$%d of `%s' has no declared type"),
-			  n, rule->sym->tag);
-	      continue;
-	    }
-	  else
-	    complain (_("$%s is invalid"), printable_version (c));
+	  copy_dollar (finput, fguard, rule, stack_offset);
 	  break;
 
 	case '@':
@@ -1291,9 +1253,11 @@ readgram (void)
   symbol_list *p1;
   bucket *bp;
 
-  symbol_list *crule;		/* points to first symbol_list of current rule.  */
-  /* its symbol is the lhs of the rule.   */
-  symbol_list *crule1;		/* points to the symbol_list preceding crule.  */
+  /* Points to first symbol_list of current rule. its symbol is the
+     lhs of the rule.  */
+  symbol_list *crule;
+  /* Points to the symbol_list preceding crule.  */
+  symbol_list *crule1;
 
   p1 = NULL;
 
@@ -1303,8 +1267,9 @@ readgram (void)
     {
       if (t == IDENTIFIER || t == BAR)
 	{
-	  int actionflag = 0;
-	  int rulelength = 0;	/* number of symbols in rhs of this rule so far  */
+	  int action_flag = 0;
+	  /* Number of symbols in rhs of this rule so far */
+	  int rulelength = 0;
 	  int xactions = 0;	/* JF for error checking */
 	  bucket *first_rhs = 0;
 
@@ -1399,7 +1364,7 @@ readgram (void)
 	      /* If we just passed an action, that action was in the middle
 	         of a rule, so make a dummy rule to reduce it to a
 	         non-terminal.  */
-	      if (actionflag)
+	      if (action_flag)
 		{
 		  bucket *sdummy;
 
@@ -1433,7 +1398,7 @@ readgram (void)
 		  p1->next = p;
 		  p1 = p;
 
-		  actionflag = 0;
+		  action_flag = 0;
 		}
 
 	      if (t == IDENTIFIER)
@@ -1447,7 +1412,7 @@ readgram (void)
 	      else		/* handle an action.  */
 		{
 		  copy_action (crule, rulelength);
-		  actionflag = 1;
+		  action_flag = 1;
 		  xactions++;	/* JF */
 		}
 	      rulelength++;
@@ -1468,9 +1433,7 @@ readgram (void)
 	  if (t == GUARD)
 	    {
 	      if (!semantic_parser)
-		complain ("%s",
-			  _
-			  ("%guard present but %semantic_parser not specified"));
+		complain (_("%%guard present but %%semantic_parser not specified"));
 
 	      copy_guard (crule, rulelength);
 	      t = lex ();
@@ -1478,10 +1441,10 @@ readgram (void)
 	  else if (t == LEFT_CURLY)
 	    {
 	      /* This case never occurs -wjh */
-	      if (actionflag)
+	      if (action_flag)
 		complain (_("two actions at end of one rule"));
 	      copy_action (crule, rulelength);
-	      actionflag = 1;
+	      action_flag = 1;
 	      xactions++;	/* -wjh */
 	      t = lex ();
 	    }
@@ -1556,7 +1519,8 @@ readgram (void)
   if (nrules == 0)
     fatal (_("no rules in the input grammar"));
 
-  if (typed == 0		/* JF put out same default YYSTYPE as YACC does */
+  /* JF put out same default YYSTYPE as YACC does */
+  if (typed == 0
       && !value_components_used)
     {
       /* We used to use `unsigned long' as YYSTYPE on MSDOS,
@@ -1574,7 +1538,7 @@ readgram (void)
       {
 	complain (_
 		  ("symbol %s is used, but is not defined as a token and has no rules"),
-bp->tag);
+		  bp->tag);
 	bp->class = nterm_sym;
 	bp->value = nvars++;
       }
@@ -1622,7 +1586,7 @@ output_token_defines (FILE *file)
 	continue;
 
       fprintf (file, "#define\t%s\t%d\n", symbol,
-	       ((translations && !rawtoknumflag)
+	       ((translations && !raw_flag)
 		? bp->user_token_number : bp->value));
       if (semantic_parser)
 	fprintf (file, "#define\tT%s\t%d\n", symbol, bp->value);
@@ -1750,7 +1714,7 @@ packsymbols (void)
 
   error_token_number = errtoken->value;
 
-  if (!noparserflag)
+  if (!no_parser_flag)
     output_token_defines (ftable);
 
   if (startval->class == unknown_sym)
@@ -1760,7 +1724,7 @@ packsymbols (void)
 
   start_symbol = startval->value;
 
-  if (definesflag)
+  if (defines_flag)
     {
       output_token_defines (fdefines);
 
@@ -1892,7 +1856,6 @@ reader (void)
 
   semantic_parser = 0;
   pure_parser = 0;
-  yylsp_needed = 0;
 
   grammar = NULL;
 
@@ -1918,7 +1881,7 @@ reader (void)
   fprintf (ftable, "\
 /* %s, made from %s\n\
    by GNU bison %s.  */\n\
-\n", noparserflag ? "Bison-generated parse tables" : "A Bison parser", infile, VERSION);
+\n", no_parser_flag ? "Bison-generated parse tables" : "A Bison parser", infile, VERSION);
 
   fputs ("#define YYBISON 1  /* Identify Bison output.  */\n\n", ftable);
   read_declarations ();
@@ -1933,7 +1896,7 @@ reader (void)
     reader_output_yylsp (fdefines);
   /* Write closing delimiters for actions and guards.  */
   output_trailers ();
-  if (yylsp_needed)
+  if (locations_flag)
     fputs ("#define YYLSP_NEEDED\n\n", ftable);
   /* Assign the symbols their symbol numbers.  Write #defines for the
      token symbols into FDEFINES if requested.  */
@@ -1949,26 +1912,22 @@ reader (void)
 void
 reader_output_yylsp (FILE *f)
 {
-  if (yylsp_needed)
+  if (locations_flag)
     fputs ("\
 \n\
 #ifndef YYLTYPE\n\
-typedef\n\
-  struct yyltype\n\
-\
-    {\n\
-      int timestamp;\n\
-      int first_line;\n\
-      int first_column;\
+typedef struct yyltype\n\
+{\n\
+  int timestamp;\n\
+  int first_line;\n\
+  int first_column;\
 \n\
-      int last_line;\n\
-      int last_column;\n\
-      char *text;\n\
-   }\n\
-\
-  yyltype;\n\
+  int last_line;\n\
+  int last_column;\n\
+  char *text;\n\
+} yyltype;\n\
 \n\
-#define YYLTYPE yyltype\n\
+# define YYLTYPE yyltype\n\
 #endif\n\
 \n",
 	   f);