(cherry picked from commit 2c82d91b8c)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent 2016ba9b1c
commit b163211001

@ -82,8 +82,8 @@ MACRO(GENERATE_BISON_FLEX_SOURCES parser parser_args
lexer lexer_args) lexer lexer_args)
GET_FILENAME_COMPONENT(parser_base "${parser}" NAME_WE) GET_FILENAME_COMPONENT(parser_base "${parser}" NAME_WE)
SET(BISON_TAB_C "${CMAKE_CURRENT_BINARY_DIR}/${parser_base}.tab.c") SET(BISON_TAB_C "${CMAKE_CURRENT_BINARY_DIR}/${parser_base}.tab.cc")
SET(BISON_TAB_H "${CMAKE_CURRENT_BINARY_DIR}/${parser_base}.tab.h") SET(BISON_TAB_H "${CMAKE_CURRENT_BINARY_DIR}/${parser_base}.tab.hh")
SET(BISON_CC "${CMAKE_CURRENT_BINARY_DIR}/${parser_base}.cc") SET(BISON_CC "${CMAKE_CURRENT_BINARY_DIR}/${parser_base}.cc")
SET(BISON_H "${CMAKE_CURRENT_BINARY_DIR}/${parser_base}.h") SET(BISON_H "${CMAKE_CURRENT_BINARY_DIR}/${parser_base}.h")

@ -30,23 +30,25 @@ install( FILES abakusui.rc DESTINATION ${DATA_INSTALL_DIR} )
##### abakus (executable) ####################### ##### abakus (executable) #######################
GENERATE_BISON_FLEX_SOURCES("lexer.ll", "", "parser.yy", "-d") GENERATE_BISON_FLEX_SOURCES(${CMAKE_SOURCE_DIR}/src/parser.yy "" ${CMAKE_SOURCE_DIR}/src/lexer.ll "")
if( HAVE_MPFR ) if( HAVE_MPFR )
set( MPFR_SOURCES "hmath.cpp number.c" ) set( MPFR_SOURCES "" )
set( MPFR_LIBRARIES "mpfr gmp" ) set( MPFR_LIBRARIES "mpfr gmp" )
else( HAVE_MPFR )
set( MPFR_SOURCES hmath.cpp number.c )
set( MPFR_LIBRARIES "" )
endif( HAVE_MPFR ) endif( HAVE_MPFR )
tde_add_executable( abakus AUTOMOC tde_add_executable( abakus AUTOMOC
SOURCES abakus.cpp abakuslistview.cpp SOURCES abakus.cpp abakuslistview.cpp
dragsupport.cpp editor.cpp dragsupport.cpp editor.cpp
evaluator.cpp function.cpp evaluator.cpp function.cpp
lexer_lex.cpp mainwindow.cpp mainwindow.cpp node.cpp
node.cpp numerictypes.cpp numerictypes.cpp result.cpp
parser_yacc.cpp result.cpp
resultlistview.cpp resultlistviewtext.cpp resultlistview.cpp resultlistviewtext.cpp
rpnmuncher.cpp valuemanager.cpp dcopIface.skel rpnmuncher.cpp valuemanager.cpp dcopIface.skel
${MPFR_SOURCES} ${BF_SOURCES} ${MPFR_SOURCES}
LINK kio-shared kdecore-shared kdeprint-shared kdeui-shared DCOP-shared ${MPFR_LIBRARIES} LINK kio-shared kdecore-shared kdeprint-shared kdeui-shared DCOP-shared ${MPFR_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -22,7 +22,7 @@
#include "evaluator.h" #include "evaluator.h"
#include "function.h" #include "function.h"
#include "node.h" // For parser_yacc.hpp below #include "node.h" // For parser_yacc.hpp below
#include "parser_yacc.hpp" #include "parser.h"
#include <tqapplication.h> #include <tqapplication.h>
#include <tqmap.h> #include <tqmap.h>

@ -24,7 +24,7 @@
#include "node.h" #include "node.h"
#include "function.h" #include "function.h"
#include "parser_yacc.hpp" #include "parser.h"
#include "result.h" #include "result.h"
int yyCurTokenPos; int yyCurTokenPos;

@ -419,7 +419,7 @@ void MainWindow::loadConfig()
TQStringList fnList = config.readListEntry("FunctionList"); TQStringList fnList = config.readListEntry("FunctionList");
for(TQStringList::ConstIterator it = fnList.begin(); it != fnList.end(); ++it) for(TQStringList::ConstIterator it = fnList.begin(); it != fnList.end(); ++it)
parseString(*it); // Run the function definitions through the parser parseString((*it).ascii()); // Run the function definitions through the parser
} }
populateListViews(); populateListViews();

@ -148,7 +148,7 @@ S: SET FUNC ASSIGN EXP {
if(manager->isFunction(funcName)) if(manager->isFunction(funcName))
manager->removeFunction(funcName); manager->removeFunction(funcName);
BaseFunction *newFn = new UserDefinedFunction(funcName, $4); BaseFunction *newFn = new UserDefinedFunction(funcName.ascii(), $4);
if(!manager->addFunction(newFn, ident)) { if(!manager->addFunction(newFn, ident)) {
TQString s(i18n("Unable to define function %1 because it is recursive.").tqarg(funcName)); TQString s(i18n("Unable to define function %1 because it is recursive.").tqarg(funcName));
Result::setLastResult(s); Result::setLastResult(s);
@ -170,7 +170,7 @@ S: SET IDENT ASSIGN EXP {
// No need to check if the function is already defined, because the // No need to check if the function is already defined, because the
// lexer checked for us before returning the IDENT token. // lexer checked for us before returning the IDENT token.
BaseFunction *newFn = new UserDefinedFunction(funcName, $4); BaseFunction *newFn = new UserDefinedFunction(funcName.ascii(), $4);
FunctionManager::instance()->addFunction(newFn, ident); FunctionManager::instance()->addFunction(newFn, ident);
Result::setLastResult(Result::Null); Result::setLastResult(Result::Null);

Loading…
Cancel
Save