vaclavt
/
mlisp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/vaclavt/mlisp

This commit is contained in:
vaclavt 2022-01-10 20:33:29 +01:00
parent 88daab5235 61bfb09948
commit 79977cc655
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -46,7 +46,6 @@ set(SOURCE
usql/usql_ddl.cpp usql/usql_ddl.cpp
usql/usql_function.cpp usql/usql_function.cpp
usql/table.cpp usql/table.cpp
usql/table.h
usql/row.cpp usql/row.cpp
usql/csvreader.cpp usql/csvreader.cpp
usql/settings.cpp usql/settings.cpp

1
usql/usql.cpp
View File

@ -173,7 +173,6 @@ std::unique_ptr<ValueNode> USql::eval_function_value_node(Table *table, Row &row
evaluatedPars.push_back(eval_value_node(table, row, param.get(), nullptr, nullptr)); evaluatedPars.push_back(eval_value_node(table, row, param.get(), nullptr, nullptr));
} }
// at this moment no functions without parameter(s) or first param can be null
if (evaluatedPars.empty() || evaluatedPars[0]->isNull()) if (evaluatedPars.empty() || evaluatedPars[0]->isNull())
return std::make_unique<NullValueNode>(); return std::make_unique<NullValueNode>();

6
utils/remote_install.sh
View File

@ -23,9 +23,9 @@ if [ "$#" -eq 1 ]; then
fi fi
echo "Building ml" echo "Building ml"
ssh -p 5333 root@46.28.109.184 "cd /tmp/mlisp; gcc -std=c99 -c -O2 -o linenoise.o clib/linenoise.c" ssh -p 5333 root@46.28.109.184 "cd /tmp/mlisp; gcc -std=c99 -c -O3 -o linenoise.o clib/linenoise.c"
ssh -p 5333 root@46.28.109.184 "cd /tmp/mlisp; c++ -c -O2 -I/usr/local/opt/openssl/include -Iclib -I./ --std=c++17 ml.cpp ml_io.cpp ml_date.cpp ml_string.cpp ml_util.cpp ml_profiler.cpp ml_usql.cpp clib/json11.cpp clib/csvparser.cpp clib/sslclient.cpp clib/tcpnet.cpp clib/printf.cpp usql/exception.cpp usql/lexer.cpp usql/parser.cpp usql/usql.cpp usql/table.cpp usql/table.h usql/row.cpp usql/csvreader.cpp usql/usql.cpp usql/usql_ddl.cpp usql/usql_dml.cpp usql/usql_function.cpp usql/settings.cpp" ssh -p 5333 root@46.28.109.184 "cd /tmp/mlisp; c++ -c -O3 -I/usr/local/opt/openssl/include -Iclib -I./ --std=c++17 ml.cpp ml_io.cpp ml_date.cpp ml_string.cpp ml_util.cpp ml_profiler.cpp ml_usql.cpp clib/json11.cpp clib/csvparser.cpp clib/sslclient.cpp clib/tcpnet.cpp clib/printf.cpp usql/exception.cpp usql/lexer.cpp usql/parser.cpp usql/usql.cpp usql/table.cpp usql/row.cpp usql/csvreader.cpp usql/usql.cpp usql/usql_ddl.cpp usql/usql_dml.cpp usql/usql_function.cpp usql/settings.cpp"
ssh -p 5333 root@46.28.109.184 "cd /tmp/mlisp; c++ -o ml -O2 -L/usr/local/lib -L/usr/local/opt/openssl/lib -lm -lstdc++ -lcrypto -lssl *.o" ssh -p 5333 root@46.28.109.184 "cd /tmp/mlisp; c++ -o ml -O3 -L/usr/local/lib -L/usr/local/opt/openssl/lib -L/lib/x86_64-linux-gnu -lm -lstdc++ -lcrypto -lssl *.o"
echo "Installing new version" echo "Installing new version"