Browse Source

Fix FTBFS

tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
2c82d91b8c
6 changed files with 15 additions and 13 deletions
  1. 2
    2
      BisonMacros.cmake
  2. 8
    6
      src/CMakeLists.txt
  3. 1
    1
      src/evaluator.cpp
  4. 1
    1
      src/lexer.ll
  5. 1
    1
      src/mainwindow.cpp
  6. 2
    2
      src/parser.yy

+ 2
- 2
BisonMacros.cmake View File

@@ -82,8 +82,8 @@ MACRO(GENERATE_BISON_FLEX_SOURCES parser parser_args
lexer lexer_args)
GET_FILENAME_COMPONENT(parser_base "${parser}" NAME_WE)

SET(BISON_TAB_C "${CMAKE_CURRENT_BINARY_DIR}/${parser_base}.tab.c")
SET(BISON_TAB_H "${CMAKE_CURRENT_BINARY_DIR}/${parser_base}.tab.h")
SET(BISON_TAB_C "${CMAKE_CURRENT_BINARY_DIR}/${parser_base}.tab.cc")
SET(BISON_TAB_H "${CMAKE_CURRENT_BINARY_DIR}/${parser_base}.tab.hh")
SET(BISON_CC "${CMAKE_CURRENT_BINARY_DIR}/${parser_base}.cc")
SET(BISON_H "${CMAKE_CURRENT_BINARY_DIR}/${parser_base}.h")


+ 8
- 6
src/CMakeLists.txt View File

@@ -30,23 +30,25 @@ install( FILES abakusui.rc DESTINATION ${DATA_INSTALL_DIR} )

##### 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 )
set( MPFR_SOURCES "hmath.cpp number.c" )
set( MPFR_SOURCES "" )
set( MPFR_LIBRARIES "mpfr gmp" )
else( HAVE_MPFR )
set( MPFR_SOURCES hmath.cpp number.c )
set( MPFR_LIBRARIES "" )
endif( HAVE_MPFR )

tde_add_executable( abakus AUTOMOC
SOURCES abakus.cpp abakuslistview.cpp
dragsupport.cpp editor.cpp
evaluator.cpp function.cpp
lexer_lex.cpp mainwindow.cpp
node.cpp numerictypes.cpp
parser_yacc.cpp result.cpp
mainwindow.cpp node.cpp
numerictypes.cpp result.cpp
resultlistview.cpp resultlistviewtext.cpp
rpnmuncher.cpp valuemanager.cpp dcopIface.skel
${MPFR_SOURCES}
${BF_SOURCES} ${MPFR_SOURCES}
LINK kio-shared tdecore-shared tdeprint-shared tdeui-shared DCOP-shared ${MPFR_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
)

+ 1
- 1
src/evaluator.cpp View File

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

#include <tqapplication.h>
#include <tqmap.h>

+ 1
- 1
src/lexer.ll View File

@@ -24,7 +24,7 @@

#include "node.h"
#include "function.h"
#include "parser_yacc.hpp"
#include "parser.h"
#include "result.h"

int yyCurTokenPos;

+ 1
- 1
src/mainwindow.cpp View File

@@ -419,7 +419,7 @@ void MainWindow::loadConfig()

TQStringList fnList = config.readListEntry("FunctionList");
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();

+ 2
- 2
src/parser.yy View File

@@ -148,7 +148,7 @@ S: SET FUNC ASSIGN EXP {
if(manager->isFunction(funcName))
manager->removeFunction(funcName);

BaseFunction *newFn = new UserDefinedFunction(funcName, $4);
BaseFunction *newFn = new UserDefinedFunction(funcName.ascii(), $4);
if(!manager->addFunction(newFn, ident)) {
TQString s(i18n("Unable to define function %1 because it is recursive.").tqarg(funcName));
Result::setLastResult(s);
@@ -170,7 +170,7 @@ S: SET IDENT ASSIGN EXP {

// No need to check if the function is already defined, because the
// 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);

Result::setLastResult(Result::Null);

Loading…
Cancel
Save