utils/qlalr generator: adapt changes to xmlstream and script files

some changes were made to qxmlstream_p.h and script files directly;
however, those files are generated automatically by
src/corelib/xml/make-parser.sh and src/script/parser/make-parser.sh,
respectively, so the generator would overwrite the manual changes to the
files the next time it is run. This patch integrates those changes into
the generator rather than into the files directly.

Reviewed-by: Roberto Raggi
Reviewed-by: Olivier Goffart

3 files changed, 17 insertions, 16 deletions

diff --git a/src/corelib/xml/make-parser.sh b/src/corelib/xml/make-parser.sh
index 9866555..35289d2 100755
--- a/src/corelib/xml/make-parser.sh
+++ b/src/corelib/xml/make-parser.sh
@@ -42,7 +42,7 @@
 
 me=$(dirname $0)
 mkdir -p $me/out
-(cd $me/out && ../../../../util/qlalr/qlalr --troll --no-debug --no-lines ../qxmlstream.g)
+(cd $me/out && ../../../../util/qlalr/qlalr --qt --no-debug --no-lines ../qxmlstream.g)
 
 for f in $me/out/*.h; do
     n=$(basename $f)
diff --git a/src/corelib/xml/qxmlstream.g b/src/corelib/xml/qxmlstream.g
index 6c0c0cf..22ba33d 100644
--- a/src/corelib/xml/qxmlstream.g
+++ b/src/corelib/xml/qxmlstream.g
@@ -158,6 +158,7 @@ public:
         if (tos + extraCapacity + 1 > cap) {
             cap = qMax(tos + extraCapacity + 1, cap << 1 );
             data = reinterpret_cast<T *>(qRealloc(data, cap * sizeof(T)));
+            Q_CHECK_PTR(data);
         }
     }
 
diff --git a/src/corelib/xml/qxmlstream_p.h b/src/corelib/xml/qxmlstream_p.h
index eee3a13..253f8bd 100644
--- a/src/corelib/xml/qxmlstream_p.h
+++ b/src/corelib/xml/qxmlstream_p.h
@@ -1,4 +1,3 @@
-// This file was generated by qlalr - DO NOT EDIT!
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
@@ -51,6 +50,7 @@
 // We mean it.
 //
 
+// This file was generated by qlalr - DO NOT EDIT!
 #ifndef QXMLSTREAM_P_H
 #define QXMLSTREAM_P_H
 
@@ -132,13 +132,13 @@ public:
   };
 
   static const char  *const    spell [];
-  static const qint16            lhs [];
-  static const qint16            rhs [];
-  static const qint16   goto_default [];
-  static const qint16 action_default [];
-  static const qint16   action_index [];
-  static const qint16    action_info [];
-  static const qint16   action_check [];
+  static const short             lhs [];
+  static const short             rhs [];
+  static const short    goto_default [];
+  static const short  action_default [];
+  static const short    action_index [];
+  static const short     action_info [];
+  static const short    action_check [];
 
   static inline int nt_action (int state, int nt)
   {
@@ -169,7 +169,7 @@ const char *const QXmlStreamReader_Table::spell [] = {
   "EMPTY", "ANY", "PCDATA", 0, 0, 0, 0, "CDATA", "ID", "IDREF", 
   "IDREFS", "ENTITIES", "NMTOKEN", "NMTOKENS", "<?xml", "version", 0};
 
-const qint16 QXmlStreamReader_Table::lhs [] = {
+const short QXmlStreamReader_Table::lhs [] = {
   57, 57, 59, 59, 59, 59, 59, 59, 59, 59, 
   67, 68, 64, 72, 72, 72, 75, 66, 66, 66, 
   66, 79, 78, 80, 80, 80, 80, 80, 80, 81, 
@@ -198,7 +198,7 @@ const qint16 QXmlStreamReader_Table::lhs [] = {
   58, 58, 58, 58, 58, 58, 58, 58, 74, 69, 
   69, 77, 111, 102, 102, 102, 102, 102, 140};
 
-const qint16 QXmlStreamReader_Table:: rhs[] = {
+const short QXmlStreamReader_Table::rhs [] = {
   2, 1, 4, 2, 2, 2, 2, 2, 2, 0, 
   1, 1, 9, 2, 4, 0, 4, 4, 6, 6, 
   4, 1, 3, 1, 1, 1, 2, 2, 2, 1, 
@@ -227,7 +227,7 @@ const qint16 QXmlStreamReader_Table:: rhs[] = {
   2, 2, 2, 2, 2, 2, 2, 0, 1, 0, 
   1, 1, 1, 1, 1, 1, 1, 1, 2};
 
-const qint16 QXmlStreamReader_Table::action_default [] = {
+const short QXmlStreamReader_Table::action_default [] = {
   10, 258, 0, 2, 1, 0, 124, 116, 118, 119, 
   126, 128, 122, 11, 113, 107, 0, 108, 127, 110, 
   114, 112, 120, 123, 125, 106, 109, 111, 117, 115, 
@@ -272,7 +272,7 @@ const qint16 QXmlStreamReader_Table::action_default [] = {
   260, 0, 230, 0, 0, 13, 269, 9, 5, 8, 
   4, 0, 7, 258, 6, 0, 3};
 
-const qint16 QXmlStreamReader_Table::goto_default [] = {
+const short QXmlStreamReader_Table::goto_default [] = {
   2, 4, 3, 49, 388, 43, 37, 52, 47, 41, 
   249, 53, 127, 84, 393, 81, 85, 126, 42, 46, 
   169, 130, 131, 146, 145, 149, 138, 136, 140, 147, 
@@ -283,7 +283,7 @@ const qint16 QXmlStreamReader_Table::goto_default [] = {
   264, 252, 251, 250, 339, 326, 325, 329, 398, 399, 
   50, 51, 59, 0};
 
-const qint16 QXmlStreamReader_Table::action_index [] = {
+const short QXmlStreamReader_Table::action_index [] = {
   -21, -57, 33, 119, 960, 70, -57, -57, -57, -57, 
   -57, -57, -57, -57, -57, -57, 105, -57, -57, -57, 
   -57, -57, -57, -57, -57, -57, -57, -57, -57, -57, 
@@ -372,7 +372,7 @@ const qint16 QXmlStreamReader_Table::action_index [] = {
   28, 15, 82, -84, -84, -84, -84, -84, -84, -84, 
   -84, -84, -84, 3, -84, 98, -84};
 
-const qint16 QXmlStreamReader_Table::action_info [] = {
+const short QXmlStreamReader_Table::action_info [] = {
   65, 332, 65, 405, 392, 385, 377, 65, 414, 410, 
   415, 55, 397, 374, 373, 217, 206, 408, 65, 65, 
   207, 211, 216, 1, 55, 199, 182, 192, 70, 70, 
@@ -506,7 +506,7 @@ const qint16 QXmlStreamReader_Table::action_info [] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0};
 
-const qint16 QXmlStreamReader_Table::action_check [] = {
+const short QXmlStreamReader_Table::action_check [] = {
   26, 18, 26, 14, 4, 4, 4, 26, 24, 14, 
   4, 26, 4, 4, 4, 4, 22, 55, 26, 26, 
   42, 4, 4, 44, 26, 22, 19, 12, 2, 2,