[open-axiom-commit] SF.net SVN: open-axiom:[2753] trunk/src
A system for computer algebra and symbolic mathematics
Brought to you by:
dos-reis
Menu
▾
▴
[open-axiom-commit] SF.net SVN: open-axiom:[2753] trunk/src
|
From: <dos...@us...> - 2012-08-18 23:57:16
|
Revision: 2753
http://open-axiom.svn.sourceforge.net/open-axiom/?rev=2753&view=rev
Author: dos-reis
Date: 2012-08-18 23:57:06 +0000 (Sat, 18 Aug 2012)
Log Message:
-----------
* boot/translator.boot (shoeOutParse): Fix thinko.
* lib/cfuns-c.c (oa_getcwd): Tidy.
(oa_spawn): Likewise.
* lib/sockio-c.c (send_string_len): Likewise.
* utils/command.cc (option_value): Likewise.
(execute_core): Likewise.
Modified Paths:
--------------
1.4.x/src/ChangeLog
1.4.x/src/boot/strap/translator.clisp
1.4.x/src/boot/translator.boot
1.4.x/src/lib/cfuns-c.c
1.4.x/src/lib/sockio-c.c
1.4.x/src/utils/command.cc
trunk/src/ChangeLog
trunk/src/boot/strap/translator.clisp
trunk/src/boot/translator.boot
trunk/src/lib/cfuns-c.c
trunk/src/lib/sockio-c.c
trunk/src/utils/command.cc
Modified: 1.4.x/src/ChangeLog
===================================================================
--- 1.4.x/src/ChangeLog 2012-07-25 07:40:30 UTC (rev 2752)
+++ 1.4.x/src/ChangeLog 2012-08-18 23:57:06 UTC (rev 2753)
@@ -1,3 +1,12 @@
+2012-08-18 Gabriel Dos Reis <gd...@cs...>
+
+ * boot/translator.boot (shoeOutParse): Fix thinko.
+ * lib/cfuns-c.c (oa_getcwd): Tidy.
+ (oa_spawn): Likewise.
+ * lib/sockio-c.c (send_string_len): Likewise.
+ * utils/command.cc (option_value): Likewise.
+ (execute_core): Likewise.
+
2012-07-25 Aleksej Saushev <as...@in...>
* hyper/htadd.c: Include <string.h>
Modified: 1.4.x/src/boot/strap/translator.clisp
===================================================================
--- 1.4.x/src/boot/strap/translator.clisp 2012-07-25 07:40:30 UTC (rev 2752)
+++ 1.4.x/src/boot/strap/translator.clisp 2012-08-18 23:57:06 UTC (rev 2753)
@@ -448,9 +448,9 @@
(T (THROW :OPEN-AXIOM-CATCH-POINT #1#))))
(T #1#))))
(COND ((EQ |found| 'TRAPPED) NIL)
- ((NOT (|bStreamNull| (|parserTokens| |ps|))) (|bpGeneralErrorHere|)
- NIL)
- ((NULL (|parserTrees| |ps|)) (|bpGeneralErrorHere|) NIL)
+ ((NOT (|bStreamNull| (|parserTokens| |ps|)))
+ (|bpGeneralErrorHere| |ps|) NIL)
+ ((NULL (|parserTrees| |ps|)) (|bpGeneralErrorHere| |ps|) NIL)
(T (CAR (|parserTrees| |ps|)))))))
(DEFUN |genDeclaration| (|n| |t|)
Modified: 1.4.x/src/boot/translator.boot
===================================================================
--- 1.4.x/src/boot/translator.boot 2012-07-25 07:40:30 UTC (rev 2752)
+++ 1.4.x/src/boot/translator.boot 2012-08-18 23:57:06 UTC (rev 2753)
@@ -362,10 +362,10 @@
catch(e: BootParserException) => e
found = 'TRAPPED => nil
not bStreamNull parserTokens ps =>
- bpGeneralErrorHere()
+ bpGeneralErrorHere ps
nil
parserTrees ps = nil =>
- bpGeneralErrorHere()
+ bpGeneralErrorHere ps
nil
first parserTrees ps
Modified: 1.4.x/src/lib/cfuns-c.c
===================================================================
--- 1.4.x/src/lib/cfuns-c.c 2012-07-25 07:40:30 UTC (rev 2752)
+++ 1.4.x/src/lib/cfuns-c.c 2012-08-18 23:57:06 UTC (rev 2753)
@@ -611,10 +611,10 @@
OPENAXIOM_C_EXPORT char*
oa_getcwd(void)
{
- int bufsz = 256;
+ size_t bufsz = 256;
char* buf = (char*) malloc(bufsz);
#ifdef __WIN32__
- int n = GetCurrentDirectory(bufsz, buf);
+ DWORD n = GetCurrentDirectory(bufsz, buf);
if (n == 0) {
perror("oa_getcwd");
exit(-1);
@@ -800,7 +800,7 @@
/* lpCurrentDirectory */ NULL,
/* lpstartupInfo */ &startup_info,
/* lpProcessInformation */ &proc_info) == 0) {
- fprintf(stderr, "oa_spawn: error %d\n", GetLastError());
+ fprintf(stderr, "oa_spawn: error %lu\n", GetLastError());
return proc->id = -1;
}
proc->id = proc_info.dwProcessId;
Modified: 1.4.x/src/lib/sockio-c.c
===================================================================
--- 1.4.x/src/lib/sockio-c.c 2012-07-25 07:40:30 UTC (rev 2752)
+++ 1.4.x/src/lib/sockio-c.c 2012-08-18 23:57:06 UTC (rev 2753)
@@ -663,7 +663,7 @@
val = swrite(sock, (const Byte*) buf, len+1, "send_string_len");
}
if (val == -1) {
- return -1;
+ return val;
}
return 0;
}
Modified: 1.4.x/src/utils/command.cc
===================================================================
--- 1.4.x/src/utils/command.cc 2012-07-25 07:40:30 UTC (rev 2752)
+++ 1.4.x/src/utils/command.cc 2012-08-18 23:57:06 UTC (rev 2753)
@@ -113,7 +113,7 @@
const char*
option_value(const Command* command, const char* opt) {
- const int n = strlen(opt);
+ const size_t n = strlen(opt);
for (int i = 1; i < command->core.argc; ++i) {
const char* arg = command->core.argv[i];
if (strlen(arg) < n)
@@ -506,7 +506,7 @@
/* lpCurrentDirectory */ NULL,
/* lpstartupInfo */ &startupInfo,
/* lpProcessInformation */ &procInfo) == 0) {
- fprintf(stderr, "error %d\n", GetLastError());
+ fprintf(stderr, "error %lu\n", GetLastError());
abort();
}
WaitForSingleObject(procInfo.hProcess, INFINITE);
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2012-07-25 07:40:30 UTC (rev 2752)
+++ trunk/src/ChangeLog 2012-08-18 23:57:06 UTC (rev 2753)
@@ -1,3 +1,12 @@
+2012-08-18 Gabriel Dos Reis <gd...@cs...>
+
+ * boot/translator.boot (shoeOutParse): Fix thinko.
+ * lib/cfuns-c.c (oa_getcwd): Tidy.
+ (oa_spawn): Likewise.
+ * lib/sockio-c.c (send_string_len): Likewise.
+ * utils/command.cc (option_value): Likewise.
+ (execute_core): Likewise.
+
2012-07-25 Aleksej Saushev <as...@in...>
* hyper/htadd.c: Include <string.h>
Modified: trunk/src/boot/strap/translator.clisp
===================================================================
--- trunk/src/boot/strap/translator.clisp 2012-07-25 07:40:30 UTC (rev 2752)
+++ trunk/src/boot/strap/translator.clisp 2012-08-18 23:57:06 UTC (rev 2753)
@@ -448,9 +448,9 @@
(T (THROW :OPEN-AXIOM-CATCH-POINT #1#))))
(T #1#))))
(COND ((EQ |found| 'TRAPPED) NIL)
- ((NOT (|bStreamNull| (|parserTokens| |ps|))) (|bpGeneralErrorHere|)
- NIL)
- ((NULL (|parserTrees| |ps|)) (|bpGeneralErrorHere|) NIL)
+ ((NOT (|bStreamNull| (|parserTokens| |ps|)))
+ (|bpGeneralErrorHere| |ps|) NIL)
+ ((NULL (|parserTrees| |ps|)) (|bpGeneralErrorHere| |ps|) NIL)
(T (CAR (|parserTrees| |ps|)))))))
(DEFUN |genDeclaration| (|n| |t|)
Modified: trunk/src/boot/translator.boot
===================================================================
--- trunk/src/boot/translator.boot 2012-07-25 07:40:30 UTC (rev 2752)
+++ trunk/src/boot/translator.boot 2012-08-18 23:57:06 UTC (rev 2753)
@@ -362,10 +362,10 @@
catch(e: BootParserException) => e
found = 'TRAPPED => nil
not bStreamNull parserTokens ps =>
- bpGeneralErrorHere()
+ bpGeneralErrorHere ps
nil
parserTrees ps = nil =>
- bpGeneralErrorHere()
+ bpGeneralErrorHere ps
nil
first parserTrees ps
Modified: trunk/src/lib/cfuns-c.c
===================================================================
--- trunk/src/lib/cfuns-c.c 2012-07-25 07:40:30 UTC (rev 2752)
+++ trunk/src/lib/cfuns-c.c 2012-08-18 23:57:06 UTC (rev 2753)
@@ -611,10 +611,10 @@
OPENAXIOM_C_EXPORT char*
oa_getcwd(void)
{
- int bufsz = 256;
+ size_t bufsz = 256;
char* buf = (char*) malloc(bufsz);
#ifdef __WIN32__
- int n = GetCurrentDirectory(bufsz, buf);
+ DWORD n = GetCurrentDirectory(bufsz, buf);
if (n == 0) {
perror("oa_getcwd");
exit(-1);
@@ -800,7 +800,7 @@
/* lpCurrentDirectory */ NULL,
/* lpstartupInfo */ &startup_info,
/* lpProcessInformation */ &proc_info) == 0) {
- fprintf(stderr, "oa_spawn: error %d\n", GetLastError());
+ fprintf(stderr, "oa_spawn: error %lu\n", GetLastError());
return proc->id = -1;
}
proc->id = proc_info.dwProcessId;
Modified: trunk/src/lib/sockio-c.c
===================================================================
--- trunk/src/lib/sockio-c.c 2012-07-25 07:40:30 UTC (rev 2752)
+++ trunk/src/lib/sockio-c.c 2012-08-18 23:57:06 UTC (rev 2753)
@@ -663,7 +663,7 @@
val = swrite(sock, (const Byte*) buf, len+1, "send_string_len");
}
if (val == -1) {
- return -1;
+ return val;
}
return 0;
}
Modified: trunk/src/utils/command.cc
===================================================================
--- trunk/src/utils/command.cc 2012-07-25 07:40:30 UTC (rev 2752)
+++ trunk/src/utils/command.cc 2012-08-18 23:57:06 UTC (rev 2753)
@@ -113,7 +113,7 @@
const char*
option_value(const Command* command, const char* opt) {
- const int n = strlen(opt);
+ const size_t n = strlen(opt);
for (int i = 1; i < command->core.argc; ++i) {
const char* arg = command->core.argv[i];
if (strlen(arg) < n)
@@ -506,7 +506,7 @@
/* lpCurrentDirectory */ NULL,
/* lpstartupInfo */ &startupInfo,
/* lpProcessInformation */ &procInfo) == 0) {
- fprintf(stderr, "error %d\n", GetLastError());
+ fprintf(stderr, "error %lu\n", GetLastError());
abort();
}
WaitForSingleObject(procInfo.hProcess, INFINITE);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|