aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTeddy <ted.sybil@gmail.com>2013-08-08 22:40:05 +0800
committerTeddy <ted.sybil@gmail.com>2013-08-08 22:40:05 +0800
commite24962104b203bd699ed3cfa2f30402a1268f9f8 (patch)
tree059e2ca1ee49ca2cafe25cf9d218bd0af9314f3c
parent64967702d0f58b1f2f2082feccb39a95e2ac4cb2 (diff)
change the name from CONS_OBJ to PAIR_OBJnew_ext
-rw-r--r--builtin.cpp2
-rw-r--r--model.cpp4
-rw-r--r--model.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/builtin.cpp b/builtin.cpp
index 72efb37..56ed81c 100644
--- a/builtin.cpp
+++ b/builtin.cpp
@@ -1282,7 +1282,7 @@ BUILTIN_PROC_DEF(is_equal) {
return new BoolObj(false);
if (a == empty_list)
continue;
- if (otype & CLS_CONS_OBJ)
+ if (otype & CLS_PAIR_OBJ)
{
*r1 = TO_PAIR(a)->car;
INC1(r1);
diff --git a/model.cpp b/model.cpp
index 3573339..87e6b69 100644
--- a/model.cpp
+++ b/model.cpp
@@ -38,7 +38,7 @@ bool EvalObj::is_opt_obj() {
}
bool EvalObj::is_pair_obj() {
- return this != empty_list && (otype & CLS_CONS_OBJ);
+ return this != empty_list && (otype & CLS_PAIR_OBJ);
}
@@ -86,7 +86,7 @@ string EvalObj::ext_repr() {
}
Pair::Pair(EvalObj *_car, EvalObj *_cdr) :
- EvalObj(CLS_CONS_OBJ), car(_car), cdr(_cdr), skip(false),
+ EvalObj(CLS_PAIR_OBJ), car(_car), cdr(_cdr), skip(false),
next(NULL) {}
ReprCons *Pair::get_repr_cons() {
diff --git a/model.h b/model.h
index be4da2b..dfbca59 100644
--- a/model.h
+++ b/model.h
@@ -22,7 +22,7 @@ const int CLS_REPR_CONS = 1 << 3;
const int CLS_REPR_STR = 1 << 4;
const int CLS_SIM_OBJ = 1 << 0;
-const int CLS_CONS_OBJ = 1 << 1;
+const int CLS_PAIR_OBJ = 1 << 1;
const int CLS_OPT_OBJ = 1 << 3;
@@ -84,7 +84,7 @@ class EvalObj : public FrameObj {
public:
/**
* Construct an EvalObj
- * @param otype the type of the EvalObj (CLS_CONS_OBJ for a
+ * @param otype the type of the EvalObj (CLS_PAIR_OBJ for a
* construction, CLS_SIM_OBJ for a simple object), which defaults to
* CLS_SIM_OBJ
*/