minor fixes

git-svn-id: https://silmor.de/svn/softmagic/elam/trunk@628 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33

diff --git a/src/elamexpression.cpp b/src/elamexpression.cpp
index 358cd81..e847457 100644 (file)
--- a/src/elamexpression.cpp
+++ b/src/elamexpression.cpp
@@ -18,6 +18,7 @@ DEFINE_DPTR(Token)
 Token::Token(Position pos)
 {
        d->pos=pos;
+       d->type=Invalid;
 }
 
 Token::Token(QString c,Token::Type t,Position pos)
@@ -32,6 +33,7 @@ Token::Token(QString c,QVariant v,Position pos)
        d->cont=c;
        d->val=v;
        d->pos=pos;
+       d->type=Literal;
 }
 
 QString Token::content()const{return d->cont;}
@@ -46,8 +48,8 @@ QDebug&operator<<(QDebug&dbg,const Token&tok)
                case Token::Invalid:dbg<<"Invalid";break;
                case Token::Name:dbg<<"Name";break;
                case Token::Operator:dbg<<"Operator";break;
-               case Token::ParClose:dbg<<"OpeningParenthesis";break;
-               case Token::ParOpen:dbg<<"ClosingParenthesis";break;
+               case Token::ParClose:dbg<<"ClosingParenthesis";break;
+               case Token::ParOpen:dbg<<"OpeningParenthesis";break;
                case Token::Comma:dbg<<"Comma";break;
                case Token::Literal:dbg<<"LiteralValue"<<",value="<<tok.literalValue();break;
                case Token::Whitespace:dbg<<"WhiteSpace";break;

diff --git a/tests/parser/parser.pro b/tests/parser/parser.pro
index 87012c4..1633f3c 100644 (file)
--- a/tests/parser/parser.pro
+++ b/tests/parser/parser.pro
@@ -1,9 +1,9 @@
 TEMPLATE = app
 TARGET = parsertest
 QT -= gui
-CONFIG += qtestlib debug
+CONFIG += qtestlib debug link_prl
 INCLUDEPATH += . ../../src
-DEPENDPATH += $$INCLUDEPATH
+DEPENDPATH += $$INCLUDEPATH ../..
 LIBS += -L../.. -lelam
 
 SOURCES += parser.cpp