fixes; property view; generated source view; refactorings

Author: rochus-keller

LispHighlighter.cpp

@@ -149,7 +149,7 @@ void Highlighter::highlightBlock(const QString& text)
         }
     }else if( lexerState == 2 )
     {
-        // wir sind in einem multi line hex string
+        // wir sind in einem multi line string
         QTextCharFormat f = formatForCategory(C_Str);
         // f.setProperty( TokenProp, int(Tok_hexstring) );
         int pos = text.indexOf('"');

LispLexer.cpp

@@ -83,13 +83,12 @@ QByteArray Token::getSymbol(const QByteArray& str)
     return sym;
 }
 
-QStringList Token::getAllSymbols()
+QByteArrayList Token::getAllSymbols()
 {
     QHash<QByteArray,QByteArray>::const_iterator i;
-    QStringList res;
+    QByteArrayList res;
     for( i = s_symbols.begin(); i != s_symbols.end(); ++i )
-        res.append( QString::fromUtf8(i.key()) );
-    res.sort(Qt::CaseInsensitive);
+        res.append( i.key() );
     return res;
 }
 
@@ -487,10 +486,13 @@ Token Lexer::string()
 Token Lexer::comment()
 {
     QByteArray str;
+    // first eat (*
     char c = readc();
     str += c;
     c = readc();
     str += c;
+
+    // now find end of comment considering included lists and strings
     int level = 0;
     bool inString = false;
     QList<int> brackets; // bracket at level

LispLexer.h

@@ -69,7 +69,7 @@ struct Token
     const char* getString() const;
 
     static QByteArray getSymbol( const QByteArray& );
-    static QStringList getAllSymbols();
+    static QByteArrayList getAllSymbols();
 };
 
 class Lexer : public QObject