From f5b2e6b149d13213b7f72df0e2b02d3f86b74ee1 Mon Sep 17 00:00:00 2001
From: why <why@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 19 May 2003 16:37:20 +0000
Subject: * lib/syck.c, lib/syck.h, lib/token.c, lib/gram.c: count line numbers
   only if line pointer has increased.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3829 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/syck/gram.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'ext/syck/gram.c')

diff --git a/ext/syck/gram.c b/ext/syck/gram.c
index 493991a81d..310e6e129b 100644
--- a/ext/syck/gram.c
+++ b/ext/syck/gram.c
@@ -319,8 +319,8 @@ static const unsigned short yyrline[] =
       83,    84,   102,   103,   106,   109,   112,   113,   121,   126,
      134,   147,   154,   159,   160,   161,   162,   163,   169,   173,
      180,   186,   190,   195,   204,   208,   214,   218,   228,   233,
-     241,   256,   257,   265,   266,   278,   285,   295,   303,   307,
-     313,   314
+     241,   256,   257,   265,   266,   278,   285,   294,   302,   306,
+     312,   313
 };
 #endif
 
@@ -1286,13 +1286,12 @@ yyreduce:
   case 46:
 #line 286 "gram.y"
     { 
-                    apply_seq_in_map( (SyckParser *)parser, yyvsp[-1].nodeData );
                     yyval.nodeData = yyvsp[-1].nodeData;
                 }
     break;
 
   case 47:
-#line 296 "gram.y"
+#line 295 "gram.y"
     {
                     yyval.nodeData = syck_new_map( 
                         syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ), 
@@ -1301,21 +1300,21 @@ yyreduce:
     break;
 
   case 48:
-#line 304 "gram.y"
+#line 303 "gram.y"
     {
                     yyval.nodeData = yyvsp[-1].nodeData;
                 }
     break;
 
   case 49:
-#line 308 "gram.y"
+#line 307 "gram.y"
     {
                     yyval.nodeData = syck_alloc_map();
                 }
     break;
 
   case 51:
-#line 315 "gram.y"
+#line 314 "gram.y"
     {
                     syck_map_update( yyvsp[-2].nodeData, yyvsp[0].nodeData );
                     syck_free_node( yyvsp[0].nodeData );
@@ -1327,7 +1326,7 @@ yyreduce:
     }
 
 /* Line 1016 of /usr/local/share/bison/yacc.c.  */
-#line 1331 "y.tab.c"
+#line 1330 "y.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1546,7 +1545,7 @@ yyreturn:
 }
 
 
-#line 322 "gram.y"
+#line 321 "gram.y"
 
 
 void
-- 
cgit v1.2.3