Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixes for ubuntu GCC 4.6

  • Loading branch information...
commit 6c0889c64ee412dc8cc298fa5ccbc528bca7d248 1 parent 7156d16
@paulhodge paulhodge authored
View
2  src/building.cpp
@@ -589,7 +589,6 @@ Branch* term_get_function_details(Term* call)
void update_extra_outputs(Term* term)
{
Branch* branch = term->owningBranch;
- bool anyAdded = false;
for (int index=1; ; index++) {
Term* placeholder = term_get_output_placeholder(term, index);
@@ -615,7 +614,6 @@ void update_extra_outputs(Term* term)
if (extra_output == NULL) {
extra_output = apply(term->owningBranch, EXTRA_OUTPUT_FUNC, TermList(term), name);
move_to_index(extra_output, term->index + index);
- anyAdded = true;
}
change_declared_type(extra_output, placeholder->type);
View
7 src/command_line.cpp
@@ -42,7 +42,6 @@ void print_usage()
" -libpath <path> : Add a module search path\n"
" -p : Print out raw source\n"
" -pp : Print out raw source with properties\n"
- " -s : Print out reconstructed source code (for testing)\n"
" -n : Don't actually run the script (for use with -p, -pp or -s)\n"
" -break-on <id> : Debugger break when term <id> is created\n"
" -print-state : Print state as text after running the script\n"
@@ -64,7 +63,6 @@ int run_command_line(caWorld* world, caValue* args)
{
bool printRaw = false;
bool printRawWithProps = false;
- bool printSource = false;
bool printState = false;
bool dontRunScript = false;
bool printTrace = false;
@@ -107,11 +105,6 @@ int run_command_line(caWorld* world, caValue* args)
continue;
}
- if (string_eq(list_get(args, 0), "-s")) {
- printSource = true;
- list_remove_index(args, 0);
- continue;
- }
if (string_eq(list_get(args, 0), "-n")) {
dontRunScript = true;
list_remove_index(args, 0);
View
1  src/dll_loading.cpp
@@ -6,6 +6,7 @@
#ifdef WINDOWS
#else
+#pragma error hi
#include <dlfcn.h>
#endif
View
2  src/file_posix.cpp
@@ -49,8 +49,8 @@ static void update_file(caFileSource*, caFileRecord* record)
// Store modified time
circa_set_int(record->sourceMetadata, modifiedTime);
- // Get file size
{
+ // Get file size
fseek(fp, 0, SEEK_END);
size_t size = ftell(fp);
rewind(fp);
View
2  src/main.cpp
@@ -15,5 +15,5 @@ int main(int argc, const char * args[])
circa_shutdown(world);
- return 0;
+ return result;
}
View
3  src/token.cpp
@@ -605,12 +605,11 @@ bool match_number(TokenizeContext &context)
void consume_number(TokenizeContext &context)
{
int lookahead = 0;
- bool minus_sign = false;
bool dot_encountered = false;
+ // Possibly consume minus sign
if (context.next(lookahead) == '-') {
lookahead++;
- minus_sign = true;
}
while (true) {
View
4 tools/ca-tests.py
@@ -4,7 +4,7 @@
import traceback
from glob import glob
-ExecutableName = 'circa_d'
+ExecutableName = 'build/circa_d'
TestRoot = 'tests'
Quiet = False
@@ -18,7 +18,7 @@ def run(self, cmd):
# Create proc if necessary
if self.proc is None:
- self.proc = subprocess.Popen("circa_d -run-stdin",
+ self.proc = subprocess.Popen(ExecutableName + " -run-stdin",
shell=True, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, close_fds=True)
Please sign in to comment.
Something went wrong with that request. Please try again.