X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/9e6688995eda7d08bc189537cde8d2a856d76bda..2ce4ed68c9b156fd353ada1a986bb61dfa42f60a:/src/scan-code.l

diff --git a/src/scan-code.l b/src/scan-code.l
index 94a8eeb5..4fc0664e 100644
--- a/src/scan-code.l
+++ b/src/scan-code.l
@@ -45,18 +45,19 @@
 
 /* The current calling start condition: SC_RULE_ACTION or
    SC_SYMBOL_ACTION. */
-# define YY_DECL const char *code_lex (int sc_context)
+# define YY_DECL char *code_lex (int sc_context, symbol_list *rule)
 YY_DECL;
 
 #define YY_USER_ACTION  location_compute (loc, &loc->end, yytext, yyleng);
 
-static void handle_action_dollar (char *cp, location dollar_loc);
-static void handle_action_at (char *cp, location at_loc);
+static void handle_action_dollar (symbol_list *rule, char *cp,
+				  location dollar_loc);
+static void handle_action_at (symbol_list *rule, char *cp, location at_loc);
 static location the_location;
 static location *loc = &the_location;
 
-/* The rule being processed. */
-symbol_list *current_rule;
+/* True if an untyped $$ or $n was seen.  */
+static bool untyped_var_seen;
 %}
  /* C and C++ comments in code. */
 %x SC_COMMENT SC_LINE_COMMENT
@@ -153,8 +154,8 @@ splice	 (\\[ \f\t\v]*\n)*
 
 <SC_RULE_ACTION>
 {
-  "$"("<"{tag}">")?(-?[0-9]+|"$")   handle_action_dollar (yytext, *loc);
-  "@"(-?[0-9]+|"$")		    handle_action_at (yytext, *loc);
+  "$"("<"{tag}">")?(-?[0-9]+|"$")   handle_action_dollar (rule, yytext, *loc);
+  "@"(-?[0-9]+|"$")		    handle_action_at (rule, yytext, *loc);
 
   "$"  {
     warn_at (*loc, _("stray `$'"));
@@ -238,11 +239,23 @@ int max_left_semantic_context = 0;
 `------------------------------------------------------------------*/
 
 static void
-handle_action_dollar (char *text, location dollar_loc)
+handle_action_dollar (symbol_list *rule, char *text, location dollar_loc)
 {
   const char *type_name = NULL;
   char *cp = text + 1;
-  int rule_length = symbol_list_length (current_rule->next);
+  symbol_list *effective_rule;
+  int effective_rule_length;
+
+  if (rule->midrule_parent_rule)
+    {
+      effective_rule = rule->midrule_parent_rule;
+      effective_rule_length = rule->midrule_parent_rhs_index - 1;
+    }
+  else
+    {
+      effective_rule = rule;
+      effective_rule_length = symbol_list_length (rule->next);
+    }
 
   /* Get the type name if explicit. */
   if (*cp == '<')
@@ -252,43 +265,66 @@ handle_action_dollar (char *text, location dollar_loc)
 	++cp;
       *cp = '\0';
       ++cp;
+      if (untyped_var_seen)
+	complain_at (dollar_loc, _("explicit type given in untyped grammar"));
+      tag_seen = true;
     }
 
   if (*cp == '$')
     {
       if (!type_name)
-	type_name = symbol_list_n_type_name_get (current_rule, dollar_loc, 0);
-      if (!type_name && typed)
-	complain_at (dollar_loc, _("$$ of `%s' has no declared type"),
-		     current_rule->sym->tag);
+	type_name = symbol_list_n_type_name_get (rule, dollar_loc, 0);
+
       if (!type_name)
-	type_name = "";
+	{
+	  if (union_seen | tag_seen)
+	    {
+	      if (rule->midrule_parent_rule)
+		complain_at (dollar_loc,
+			     _("$$ for the midrule at $%d of `%s'"
+			       " has no declared type"),
+			     rule->midrule_parent_rhs_index,
+			     effective_rule->sym->tag);
+	      else
+		complain_at (dollar_loc, _("$$ of `%s' has no declared type"),
+			     rule->sym->tag);
+	    }
+	  else
+	    untyped_var_seen = true;
+	  type_name = "";
+	}
+
       obstack_fgrow1 (&obstack_for_string,
 		      "]b4_lhs_value([%s])[", type_name);
-      current_rule->used = true;
+      rule->used = true;
     }
   else
     {
-      long int num;
-      set_errno (0);
-      num = strtol (cp, 0, 10);
-      if (INT_MIN <= num && num <= rule_length && ! get_errno ())
+      long int num = strtol (cp, NULL, 10);
+
+      if (1 - INT_MAX + effective_rule_length <= num
+	  && num <= effective_rule_length)
 	{
 	  int n = num;
-	  if (1-n > max_left_semantic_context)
-	    max_left_semantic_context = 1-n;
-	  if (!type_name && n > 0)
+	  if (max_left_semantic_context < 1 - n)
+	    max_left_semantic_context = 1 - n;
+	  if (!type_name && 0 < n)
 	    type_name =
-	      symbol_list_n_type_name_get (current_rule, dollar_loc, n);
-	  if (!type_name && typed)
-	    complain_at (dollar_loc, _("$%d of `%s' has no declared type"),
-			 n, current_rule->sym->tag);
+	      symbol_list_n_type_name_get (effective_rule, dollar_loc, n);
 	  if (!type_name)
-	    type_name = "";
+	    {
+	      if (union_seen | tag_seen)
+		complain_at (dollar_loc, _("$%d of `%s' has no declared type"),
+			     n, effective_rule->sym->tag);
+	      else
+		untyped_var_seen = true;
+	      type_name = "";
+	    }
+
 	  obstack_fgrow3 (&obstack_for_string,
 			  "]b4_rhs_value(%d, %d, [%s])[",
-			  rule_length, n, type_name);
-	  symbol_list_n_used_set (current_rule, n, true);
+			  effective_rule_length, n, type_name);
+	  symbol_list_n_used_set (effective_rule, n, true);
 	}
       else
 	complain_at (dollar_loc, _("integer out of range: %s"), quote (text));
@@ -302,25 +338,29 @@ handle_action_dollar (char *text, location dollar_loc)
 `------------------------------------------------------*/
 
 static void
-handle_action_at (char *text, location at_loc)
+handle_action_at (symbol_list *rule, char *text, location at_loc)
 {
   char *cp = text + 1;
-  int rule_length = symbol_list_length (current_rule->next);
   locations_flag = true;
+  int effective_rule_length;
+
+  if (rule->midrule_parent_rule)
+    effective_rule_length = rule->midrule_parent_rhs_index - 1;
+  else
+    effective_rule_length = symbol_list_length (rule->next);
 
   if (*cp == '$')
     obstack_sgrow (&obstack_for_string, "]b4_lhs_location[");
   else
     {
-      long int num;
-      set_errno (0);
-      num = strtol (cp, 0, 10);
+      long int num = strtol (cp, NULL, 10);
 
-      if (INT_MIN <= num && num <= rule_length && ! get_errno ())
+      if (1 - INT_MAX + effective_rule_length <= num
+	  && num <= effective_rule_length)
 	{
 	  int n = num;
 	  obstack_fgrow2 (&obstack_for_string, "]b4_rhs_location(%d, %d)[",
-			  rule_length, n);
+			  effective_rule_length, n);
 	}
       else
 	complain_at (at_loc, _("integer out of range: %s"), quote (text));
@@ -332,14 +372,14 @@ handle_action_at (char *text, location at_loc)
 | Initialize the scanner.  |
 `-------------------------*/
 
-/* Translate the dollars and ats in \a a, whose location is l.
-   Depending on the \a sc_context (SC_RULE_ACTION, SC_SYMBOL_ACTION,
-   INITIAL), the processing is different.  */
+/* Translate the dollars and ats in \a a, whose location is \a l.  The
+   translation is for \a rule, in the context \a sc_context
+   (SC_RULE_ACTION, SC_SYMBOL_ACTION, INITIAL).  */
 
-static const char *
-translate_action (int sc_context, const char *a, location l)
+static char *
+translate_action (int sc_context, symbol_list *rule, const char *a, location l)
 {
-  const char *res;
+  char *res;
   static bool initialized = false;
   if (!initialized)
     {
@@ -352,29 +392,29 @@ translate_action (int sc_context, const char *a, location l)
 
   loc->start = loc->end = l.start;
   yy_switch_to_buffer (yy_scan_string (a));
-  res = code_lex (sc_context);
+  res = code_lex (sc_context, rule);
   yy_delete_buffer (YY_CURRENT_BUFFER);
 
   return res;
 }
 
-const char *
-translate_rule_action (symbol_list *r, const char *a, location l)
+char *
+translate_rule_action (symbol_list *rule)
 {
-  current_rule = r;
-  return translate_action (SC_RULE_ACTION, a, l);
+  return translate_action (SC_RULE_ACTION, rule, rule->action,
+			   rule->action_location);
 }
 
-const char *
+char *
 translate_symbol_action (const char *a, location l)
 {
-  return translate_action (SC_SYMBOL_ACTION, a, l);
+  return translate_action (SC_SYMBOL_ACTION, NULL, a, l);
 }
 
-const char *
+char *
 translate_code (const char *a, location l)
 {
-  return translate_action (INITIAL, a, l);
+  return translate_action (INITIAL, NULL, a, l);
 }
 
 /*-----------------------------------------------.