From 3edfae0490775319d075e31a05d18d0e2bbd852b Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@lrde.epita.fr>
Date: Tue, 14 Aug 2012 10:04:27 +0200
Subject: [PATCH] style changes

* data/glr.cc, tests/actions.at: Fix comments.
* src/symtab.h, src/symtab.c: Fix indentation/comments.
* src/symlist.c: Fix indentation.
---
 data/glr.cc      |  4 ++--
 src/symlist.c    | 26 +++++++++++++-------------
 src/symtab.c     |  2 +-
 src/symtab.h     |  9 ++++-----
 tests/actions.at |  7 ++++---
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/data/glr.cc b/data/glr.cc
index 69b328b6..56edcb21 100644
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -62,7 +62,7 @@ m4_define([b4_parse_param_orig], m4_defn([b4_parse_param]))
 
 
 # b4_yy_symbol_print_define
-# ---------------------------
+# -------------------------
 # Bypass the default implementation to generate the "yy_symbol_print"
 # and "yy_symbol_value_print" functions.
 m4_define([b4_yy_symbol_print_define],
@@ -123,7 +123,7 @@ m4_append([b4_epilogue],
 
 
 ]b4_namespace_open[
-]dnl In this section, the parse param are the original parse_params.
+]dnl In this section, the parse params are the original parse_params.
 m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
 [  /// Build a parser object.
   ]b4_parser_class_name::b4_parser_class_name[ (]b4_parse_param_decl[)]m4_ifset([b4_parse_param], [
diff --git a/src/symlist.c b/src/symlist.c
index 2bbedb58..005331b2 100644
--- a/src/symlist.c
+++ b/src/symlist.c
@@ -195,18 +195,18 @@ symbol_list_code_props_set (symbol_list *node, code_props_type kind,
 {
   switch (node->content_type)
     {
-      case SYMLIST_SYMBOL:
-        symbol_code_props_set (node->content.sym, kind, cprops);
-        if (node->content.sym->status == undeclared)
-          node->content.sym->status = used;
-        break;
-      case SYMLIST_TYPE:
-        semantic_type_code_props_set
-          (semantic_type_get (node->content.sem_type->tag,
-                              &node->content.sem_type->location),
-           kind, cprops);
-        if (node->content.sem_type->status == undeclared)
-          node->content.sem_type->status = used;
-        break;
+    case SYMLIST_SYMBOL:
+      symbol_code_props_set (node->content.sym, kind, cprops);
+      if (node->content.sym->status == undeclared)
+        node->content.sym->status = used;
+      break;
+    case SYMLIST_TYPE:
+      semantic_type_code_props_set
+        (semantic_type_get (node->content.sem_type->tag,
+                            &node->content.sem_type->location),
+         kind, cprops);
+      if (node->content.sem_type->status == undeclared)
+        node->content.sem_type->status = used;
+      break;
     }
 }
diff --git a/src/symtab.c b/src/symtab.c
index 68c33c7a..b1b2e98f 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -396,7 +396,7 @@ symbol_check_defined (symbol *sym)
           complain_at (sym->location, complaint,
                        _("symbol %s is used, but is not defined as a token"
                          " and has no rules"),
-                    sym->tag);
+                       sym->tag);
           break;
         case declared:
           /* If declared, then sym->class != unknown_sym. */
diff --git a/src/symtab.h b/src/symtab.h
index 49eebd4c..09100f6a 100644
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -54,13 +54,12 @@ typedef struct symbol symbol;
 /* Declaration status of a symbol.
 
    First, it is "undeclared".  Then, if "undeclared" and used in a
-   %printer/%destructor, it is "used".  If not "declared" by used in a
-   rule, it is "needed".  Finally, if declared (via a rule for
-   nonterminals, or %oken), it is "declared".
+   %printer/%destructor, it is "used".  If not "declared" but used in
+   a rule, it is "needed".  Finally, if declared (via a rule for
+   nonterminals, or %token), it is "declared".
 
    When status are checked at the end, "declared" symbols are fine,
-   "used" symbols trigger warnings, otherwise it's an error.
-*/
+   "used" symbols trigger warnings, otherwise it's an error.  */
 
 typedef enum
   {
diff --git a/tests/actions.at b/tests/actions.at
index 269bcce5..dd71c3b4 100644
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -1259,10 +1259,11 @@ AT_CHECK_ACTION_LOCATIONS([[%printer]])
 ## Qualified $$ in actions.  ##
 ## ------------------------- ##
 
-# Check that we can used qualified $$ (v.g., $<type>$) not only in
-# rule actions, but also where $$ is valid: %printer and %destructor.
+# Check that we can use qualified $$ (v.g., $<type>$) not only in rule
+# actions, but also where $$ is valid: %destructor/%printer and
+# %initial-action.
 #
-# FIXME: Not actually checking %desctructor, but it's the same code as
+# FIXME: Not actually checking %destructor, but it's the same code as
 # %printer...
 #
 # To do that, use a semantic value that has two fields (sem_type),
-- 
2.45.2