[Kde-bindings] KDE/kdebindings/generator

[Richard Dale]

SVN commit 1184022 by rdale:

* Apply patch from Rex Dieter for fixing issues with parsing the
QtOpenGL module. Thanks for the patch.

CCMAIL: kde-bindings at kde.org


 M  +3 -3      parser/rpp/pp-macro-expander.cpp  
 M  +1 -1      type_compiler.cpp  


--- trunk/KDE/kdebindings/generator/parser/rpp/pp-macro-expander.cpp #1184021:1184022
@@ -268,10 +268,10 @@
         output << '\"';
 
         while (!is.atEnd()) {
-          if (input == '"') {
+          if (is == '"') {
             output << '\\' << is;
 
-          } else if (input == '\n') {
+          } else if (is == '\n') {
             output << '"' << is << '"';
 
           } else {
@@ -338,7 +338,7 @@
             
             skip_blanks(input, devnull());
             //Omit paste tokens behind empty used actuals, else we will merge with the previous text
-            if(input == '#' && (++input) == '#') {
+            if(!input.atEnd() && input == '#' && !(++input).atEnd() && input == '#') {
               ++input;
               //We have skipped a paste token
             }else{
--- trunk/KDE/kdebindings/generator/type_compiler.cpp #1184021:1184022
@@ -182,7 +182,7 @@
     TypeCompiler tc(m_session, m_visitor);
     tc.run(node->type_specifier, node->declarator);
     NameCompiler name_cc(m_session, m_visitor);
-    if (tc.type().isFunctionPointer())
+    if (tc.type().isFunctionPointer() && node->declarator && node->declarator->sub_declarator)
         name_cc.run(node->declarator->sub_declarator->id);
     else if (node->declarator)
         name_cc.run(node->declarator->id);