[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/khtml/css
From:       Germain Garand <germain () ebooksfrance ! org>
Date:       2009-04-30 0:07:37
Message-ID: 1241050057.346232.14227.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 961353 by ggarand:

remove this $$ test, this is the initial context, and Bison won't
initialise it to zero ; so this is pointless and bogus.

diagnosed by Maksim


 M  +21 -25    parser.cpp  
 M  +3 -7      parser.y  


--- trunk/KDE/kdelibs/khtml/css/parser.cpp #961352:961353
@@ -681,24 +681,24 @@
 {
        0,   292,   292,   293,   294,   295,   296,   300,   301,   305,
      312,   318,   343,   350,   351,   354,   356,   357,   360,   362,
-     365,   376,   379,   384,   386,   397,   407,   410,   416,   417,
-     421,   429,   430,   434,   435,   438,   440,   451,   452,   453,
-     454,   455,   456,   457,   461,   462,   463,   464,   468,   469,
-     473,   479,   482,   488,   494,   498,   505,   508,   514,   517,
-     520,   526,   529,   535,   538,   543,   547,   552,   559,   570,
-     582,   583,   593,   615,   618,   624,   627,   633,   634,   635,
-     639,   640,   644,   666,   679,   697,   707,   710,   713,   727,
-     741,   748,   749,   750,   754,   759,   766,   773,   781,   791,
-     804,   809,   816,   824,   837,   841,   847,   850,   860,   867,
-     881,   882,   883,   887,   904,   911,   917,   924,   933,   946,
-     949,   952,   955,   958,   961,   967,   968,   972,   978,   984,
-     991,   998,  1005,  1012,  1021,  1024,  1027,  1030,  1035,  1041,
-    1045,  1048,  1053,  1059,  1081,  1087,  1094,  1095,  1099,  1103,
-    1119,  1122,  1125,  1131,  1132,  1134,  1135,  1136,  1142,  1143,
-    1144,  1146,  1152,  1153,  1154,  1155,  1156,  1157,  1158,  1159,
-    1160,  1161,  1162,  1163,  1164,  1165,  1166,  1167,  1168,  1169,
-    1170,  1171,  1172,  1177,  1185,  1201,  1208,  1214,  1223,  1249,
-    1250,  1254,  1255
+     365,   374,   376,   380,   382,   393,   403,   406,   412,   413,
+     417,   425,   426,   430,   431,   434,   436,   447,   448,   449,
+     450,   451,   452,   453,   457,   458,   459,   460,   464,   465,
+     469,   475,   478,   484,   490,   494,   501,   504,   510,   513,
+     516,   522,   525,   531,   534,   539,   543,   548,   555,   566,
+     578,   579,   589,   611,   614,   620,   623,   629,   630,   631,
+     635,   636,   640,   662,   675,   693,   703,   706,   709,   723,
+     737,   744,   745,   746,   750,   755,   762,   769,   777,   787,
+     800,   805,   812,   820,   833,   837,   843,   846,   856,   863,
+     877,   878,   879,   883,   900,   907,   913,   920,   929,   942,
+     945,   948,   951,   954,   957,   963,   964,   968,   974,   980,
+     987,   994,  1001,  1008,  1017,  1020,  1023,  1026,  1031,  1037,
+    1041,  1044,  1049,  1055,  1077,  1083,  1090,  1091,  1095,  1099,
+    1115,  1118,  1121,  1127,  1128,  1130,  1131,  1132,  1138,  1139,
+    1140,  1142,  1148,  1149,  1150,  1151,  1152,  1153,  1154,  1155,
+    1156,  1157,  1158,  1159,  1160,  1161,  1162,  1163,  1164,  1165,
+    1166,  1167,  1168,  1173,  1181,  1197,  1204,  1210,  1219,  1245,
+    1246,  1250,  1251
 };
 #endif
 
@@ -2021,25 +2021,21 @@
      kDebug( 6080 ) << "charset rule: " << qString((yyvsp[(3) - (5)].string));
 #endif
      CSSParser* p = static_cast<CSSParser*>(parser);
-     if ((yyval.rule) && p->styleElement && p->styleElement->isCSSStyleSheet()) {
-         (yyval.rule) = new CSSCharsetRuleImpl(p->styleElement, domString((yyvsp[(3) \
                - (5)].string)));
-         p->styleElement->append((yyval.rule));
-     } else
-         (yyval.rule) = 0;
+     if (p->styleElement && p->styleElement->isCSSStyleSheet()) {
+         p->styleElement->append( new CSSCharsetRuleImpl(p->styleElement, \
domString((yyvsp[(3) - (5)].string))) ); +     }
  ;}
     break;
 
   case 21:
 
     {
-      (yyval.rule) = 0;
  ;}
     break;
 
   case 22:
 
     {
-      (yyval.rule) = 0;
  ;}
     break;
 
--- trunk/KDE/kdelibs/khtml/css/parser.y #961352:961353
@@ -367,17 +367,13 @@
      kDebug( 6080 ) << "charset rule: " << qString($3);
 #endif
      CSSParser* p = static_cast<CSSParser*>(parser);
-     if ($$ && p->styleElement && p->styleElement->isCSSStyleSheet()) {
-         $$ = new CSSCharsetRuleImpl(p->styleElement, domString($3));
-         p->styleElement->append($$);
-     } else
-         $$ = 0;
+     if (p->styleElement && p->styleElement->isCSSStyleSheet()) {
+         p->styleElement->append( new CSSCharsetRuleImpl(p->styleElement, \
domString($3)) ); +     }
  }
   | CHARSET_SYM error invalid_block {
-      $$ = 0;
  }
   | CHARSET_SYM error ';' {
-      $$ = 0;
  }
  ;
 


[prev in list] [next in list] [prev in thread] [next in thread]