summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules/python
diff options
context:
space:
mode:
Diffstat (limited to 'sca-cpp/trunk/modules/python')
-rw-r--r--sca-cpp/trunk/modules/python/driver.hpp2
-rw-r--r--sca-cpp/trunk/modules/python/eval.hpp2
-rw-r--r--sca-cpp/trunk/modules/python/python-test.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/sca-cpp/trunk/modules/python/driver.hpp b/sca-cpp/trunk/modules/python/driver.hpp
index 41daed32c3..3b02302c65 100644
--- a/sca-cpp/trunk/modules/python/driver.hpp
+++ b/sca-cpp/trunk/modules/python/driver.hpp
@@ -38,7 +38,7 @@ namespace python {
const value evalDriverLoop(PyObject* const script, istream& in, ostream& out, PythonRuntime& py) {
scheme::promptForInput(scheme::evalInputPrompt, out);
const value input = content(scheme::readValue(in));
- if (isNil(input))
+ if (isNull(input))
return input;
const failable<value> output = evalScript(input, script, py);
scheme::announceOutput(scheme::evalOutputPrompt, out);
diff --git a/sca-cpp/trunk/modules/python/eval.hpp b/sca-cpp/trunk/modules/python/eval.hpp
index 3f9c6c20a2..3728cdb7bb 100644
--- a/sca-cpp/trunk/modules/python/eval.hpp
+++ b/sca-cpp/trunk/modules/python/eval.hpp
@@ -483,7 +483,7 @@ PyObject* const mkPyLambda(const lvvlambda& l, PythonRuntime* const py) {
* Convert a list of values to a python list.
*/
PyObject* const valuesToPyListHelper(PyObject* const l, const list<value>& v, PythonRuntime* const py) {
- if (isNil(v))
+ if (isNull(v))
return l;
PyObject* const pyv = valueToPyObject(car(v), py);
PyList_Append(l, pyv);
diff --git a/sca-cpp/trunk/modules/python/python-test.cpp b/sca-cpp/trunk/modules/python/python-test.cpp
index 44a72f8f88..65b18c9b1b 100644
--- a/sca-cpp/trunk/modules/python/python-test.cpp
+++ b/sca-cpp/trunk/modules/python/python-test.cpp
@@ -197,7 +197,7 @@ const list<future<bool> > submitEvals(worker& w, const int max, const int i, PyO
}
const bool checkEvalResults(const list<future<bool> > r) {
- if (isNil(r))
+ if (isNull(r))
return true;
assert(car(r) == true);
return checkEvalResults(cdr(r));