Changeset c9383ee for tools/prettyprinter/parser.yy

Timestamp:

Jun 29, 2017, 9:39:17 AM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc

Children:

288eede, 8c680e9, ae47a23

Parents:

c89503c

Message:

update input file and formatting

File:

• tools/prettyprinter/parser.yy (modified) (5 diffs)

tools/prettyprinter/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Dec 15 13:44:21 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 28 23:27:34 2017
-// Update Count     : 1043
+// Last Modified On : Thu Jun 29 09:26:47 2017
+// Update Count     : 1045
 // 
 
@@ -233 +233 @@
                     $$ = $1;
                 }
-| THONG                                                                                                 // bison
+        | THONG                                                                                         // bison
         ;
 
@@ -276 +276 @@
         ;
 
-namenolist      : nameno
-                        {
-                            //cerr << "namenolist1: " << $1->text << "(" << $1 << ")" << endl;
-                            $$ = nameliststart = $1;
-                        }
-                | namenolist nameno
-                        {
-                            //cerr << "namenolist2: " << $1->text << "(" << $1 << ") " << $2->text << "(" << $2 << ")" << endl;
-                            $1->left = $2;
-                            $$ = $2;
-                        }
-                | namenolist ',' nameno
-                        {
-                            //cerr << "namenolist3: " << $1->text << "(" << $1 << ") " << $2->text << "(" << $2 << ") " << $3->text << "(" << $3 << ")" << endl;
-                            $1->left = $2;
-                            $2->left = $3;
-                            $$ = $3;
-                        }
-                ;
-
-nameno          : name
-                        {
-                            $$ = new Token( "nameno", _NAMENO );
-                            $$->down = $1;
-                        }
-                | name INTEGER
-                        {
-                            $$ = new Token( "nameno", _NAMENO );
-                            $1->left = $2;
-                            $$->down = $1;
-                        }
-                ;
-
-namelist        : name
-                        {
-                            //cerr << "namelist1: " << $1->text << "(" << $1 << ")" << endl;
-                            $$ = nameliststart = $1;
-                        }
-                | namelist name
-                        {
-                            //cerr << "namelist2: " << $1->text << "(" << $1 << ") " << $2->text << "(" << $2 << ")" << endl;
-                            $1->left = $2;
-                            $$ = $2;
-                        }
-                | namelist ',' name
-                        {
-                            //cerr << "namelist3: " << $1->text << "(" << $1 << ") " << $2->text << "(" << $2 << ") " << $3->text << "(" << $3 << ")" << endl;
-                            $1->left = $2;
-                            $2->left = $3;
-                            $$ = $3;
-                        }
-                ;
-
-name            : IDENTIFIER
-                | CHARACTER
-                ;
-
-rulesection     : rules
-                        {
-                            //cerr << "rulesection1: " << $1->text << "(" << $1 << ")" << endl;
-                            $$ = new Token( "rulesection", _RULESECTION );
-                            $$->down = $1;
-                        }
-                | error                                 /* no rules */
-                        {
-                            cerr << "no rules in the input grammar" << endl;
-                            exit( -1 );
-                        }
-                ;
+namenolist :
+        nameno
+                {
+                        //cerr << "namenolist1: " << $1->text << "(" << $1 << ")" << endl;
+                        $$ = nameliststart = $1;
+                }
+        | namenolist nameno
+                {
+                    //cerr << "namenolist2: " << $1->text << "(" << $1 << ") " << $2->text << "(" << $2 << ")" << endl;
+                    $1->left = $2;
+                    $$ = $2;
+                }
+        | namenolist ',' nameno
+                {
+                    //cerr << "namenolist3: " << $1->text << "(" << $1 << ") " << $2->text << "(" << $2 << ") " << $3->text << "(" << $3 << ")" << endl;
+                    $1->left = $2;
+                    $2->left = $3;
+                    $$ = $3;
+                }
+        ;
+
+nameno :
+        name
+                {
+                    $$ = new Token( "nameno", _NAMENO );
+                    $$->down = $1;
+                }
+        | name INTEGER
+                {
+                    $$ = new Token( "nameno", _NAMENO );
+                    $1->left = $2;
+                    $$->down = $1;
+                }
+        ;
+
+namelist :
+        name
+                {
+                    //cerr << "namelist1: " << $1->text << "(" << $1 << ")" << endl;
+                    $$ = nameliststart = $1;
+                }
+        | namelist name
+                {
+                    //cerr << "namelist2: " << $1->text << "(" << $1 << ") " << $2->text << "(" << $2 << ")" << endl;
+                    $1->left = $2;
+                    $$ = $2;
+                }
+        | namelist ',' name
+                {
+                    //cerr << "namelist3: " << $1->text << "(" << $1 << ") " << $2->text << "(" << $2 << ") " << $3->text << "(" << $3 << ")" << endl;
+                    $1->left = $2;
+                    $2->left = $3;
+                    $$ = $3;
+                }
+        ;
+
+name :
+        IDENTIFIER
+        | CHARACTER
+        ;
+
+rulesection :
+        rules
+                {
+                    //cerr << "rulesection1: " << $1->text << "(" << $1 << ")" << endl;
+                    $$ = new Token( "rulesection", _RULESECTION );
+                    $$->down = $1;
+                }
+        | error                                                                                         // no rules
+                {
+                        cerr << "no rules in the input grammar" << endl;
+                        exit( -1 );
+                }
+        ;
 
 // These grammar rules are complex because the Yacc language is LR(2) due to the optional ';' at the end of rules. The
@@ -351 +356 @@
 // (rules, rhs) being built but only one list tail can be returned through $$ for chaining.
 
-rules           : lhs rhs
-                        {
-                            //cerr << "rules1: " << $1->text << "(" << $1 << ") " << $2->text << "(" << $2 << ")" << endl;
-                            $$ = rulestart;
-                        }
-                | lhs rhs ';'
-                        {
-                            //cerr << "rules2: " << $1->text << "(" << $1 << ") " << $2->text << "(" << $2 << ") " << $3->text << "(" << $3 << ")" << endl;
-                            $2->addDownLeftTail( $3 );
-                            $$ = rulestart;
-                        }
-                ;
-
-lhs             : IDENTIFIER ':'
-                        {
-                            //cerr << "lhs: " << $1->text << "(" << $1 << ") " << $2->text << "(" << $2 << ")" << endl;
-                            $$ = new Token( "lhs", _LHS );
-                            //cerr << " lhs: "  << $$->text << "(" << $$ << ")" << endl;
-                            $1->left = $2;
-                            $$->down = $1;
-                        }
-                ;
+rules :
+        lhs rhs
+                {
+                    //cerr << "rules1: " << $1->text << "(" << $1 << ") " << $2->text << "(" << $2 << ")" << endl;
+                    $$ = rulestart;
+                }
+        | lhs rhs ';'
+                {
+                    //cerr << "rules2: " << $1->text << "(" << $1 << ") " << $2->text << "(" << $2 << ") " << $3->text << "(" << $3 << ")" << endl;
+                    $2->addDownLeftTail( $3 );
+                    $$ = rulestart;
+                }
+        ;
+
+lhs :
+        IDENTIFIER ':'
+                {
+                    //cerr << "lhs: " << $1->text << "(" << $1 << ") " << $2->text << "(" << $2 << ")" << endl;
+                    $$ = new Token( "lhs", _LHS );
+                    //cerr << " lhs: "  << $$->text << "(" << $$ << ")" << endl;
+                    $1->left = $2;
+                    $$->down = $1;
+                }
+        ;
 
 rhs     :
@@ -479 +486 @@
 ccode_opt :
         // empty
+                {}
         | blocks
         ;