conservatory
/
picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove pic_symbol_value

This commit is contained in:
Yuichi Nishiwaki 2015-01-19 11:02:22 +09:00
parent fc654dd280
commit f349e4148e
3 changed files with 46 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
extlib/benz/codegen.c
View File

@ -283,7 +283,7 @@ analyze(analyze_state *state, pic_value obj, bool tailpos)
/* pass through */ /* pass through */
} }
else { else {
res = pic_list2(pic, pic_symbol_value(state->sRETURN), res); res = pic_list2(pic, pic_sym_value(state->sRETURN), res);
} }
} }
@ -298,7 +298,7 @@ analyze_global_var(analyze_state *state, pic_sym sym)
{ {
pic_state *pic = state->pic; pic_state *pic = state->pic;
return pic_list2(pic, pic_symbol_value(state->sGREF), pic_sym_value(sym)); return pic_list2(pic, pic_sym_value(state->sGREF), pic_sym_value(sym));
} }
static pic_value static pic_value
@ -306,7 +306,7 @@ analyze_local_var(analyze_state *state, pic_sym sym)
{ {
pic_state *pic = state->pic; pic_state *pic = state->pic;
return pic_list2(pic, pic_symbol_value(state->sLREF), pic_sym_value(sym)); return pic_list2(pic, pic_sym_value(state->sLREF), pic_sym_value(sym));
} }
static pic_value static pic_value
@ -314,7 +314,7 @@ analyze_free_var(analyze_state *state, pic_sym sym, int depth)
{ {
pic_state *pic = state->pic; pic_state *pic = state->pic;
return pic_list3(pic, pic_symbol_value(state->sCREF), pic_int_value(depth), pic_sym_value(sym)); return pic_list3(pic, pic_sym_value(state->sCREF), pic_int_value(depth), pic_sym_value(sym));
} }
static pic_value static pic_value
@ -480,7 +480,7 @@ analyze_define(analyze_state *state, pic_value obj)
val = analyze(state, pic_list_ref(pic, obj, 2), false); val = analyze(state, pic_list_ref(pic, obj, 2), false);
} }
return pic_list3(pic, pic_symbol_value(pic->sSETBANG), var, val); return pic_list3(pic, pic_sym_value(pic->sSETBANG), var, val);
} }
static pic_value static pic_value
@ -505,7 +505,7 @@ analyze_if(analyze_state *state, pic_value obj, bool tailpos)
if_true = analyze(state, if_true, tailpos); if_true = analyze(state, if_true, tailpos);
if_false = analyze(state, if_false, tailpos); if_false = analyze(state, if_false, tailpos);
return pic_list4(pic, pic_symbol_value(pic->sIF), cond, if_true, if_false); return pic_list4(pic, pic_sym_value(pic->sIF), cond, if_true, if_false);
} }
static pic_value static pic_value
@ -521,7 +521,7 @@ analyze_begin(analyze_state *state, pic_value obj, bool tailpos)
case 2: case 2:
return analyze(state, pic_list_ref(pic, obj, 1), tailpos); return analyze(state, pic_list_ref(pic, obj, 1), tailpos);
default: default:
seq = pic_list1(pic, pic_symbol_value(pic->sBEGIN)); seq = pic_list1(pic, pic_sym_value(pic->sBEGIN));
for (obj = pic_cdr(pic, obj); ! pic_nil_p(obj); obj = pic_cdr(pic, obj)) { for (obj = pic_cdr(pic, obj); ! pic_nil_p(obj); obj = pic_cdr(pic, obj)) {
if (pic_nil_p(pic_cdr(pic, obj))) { if (pic_nil_p(pic_cdr(pic, obj))) {
tail = tailpos; tail = tailpos;
@ -554,7 +554,7 @@ analyze_set(analyze_state *state, pic_value obj)
var = analyze(state, var, false); var = analyze(state, var, false);
val = analyze(state, val, false); val = analyze(state, val, false);
return pic_list3(pic, pic_symbol_value(pic->sSETBANG), var, val); return pic_list3(pic, pic_sym_value(pic->sSETBANG), var, val);
} }
static pic_value static pic_value
@ -569,18 +569,18 @@ analyze_quote(analyze_state *state, pic_value obj)
} }
#define ARGC_ASSERT_GE(n) do { \ #define ARGC_ASSERT_GE(n) do { \
if (pic_length(pic, obj) < (n) + 1) { \ if (pic_length(pic, obj) < (n) + 1) { \
pic_errorf(pic, "wrong number of arguments"); \ pic_errorf(pic, "wrong number of arguments"); \
} \ } \
} while (0) } while (0)
#define FOLD_ARGS(sym) do { \ #define FOLD_ARGS(sym) do { \
obj = analyze(state, pic_car(pic, args), false); \ obj = analyze(state, pic_car(pic, args), false); \
pic_for_each (arg, pic_cdr(pic, args)) { \ pic_for_each (arg, pic_cdr(pic, args)) { \
obj = pic_list3(pic, pic_symbol_value(sym), obj, \ obj = pic_list3(pic, pic_sym_value(sym), obj, \
analyze(state, arg, false)); \ analyze(state, arg, false)); \
} \ } \
} while (0) } while (0)
static pic_value static pic_value
analyze_add(analyze_state *state, pic_value obj, bool tailpos) analyze_add(analyze_state *state, pic_value obj, bool tailpos)
@ -591,7 +591,7 @@ analyze_add(analyze_state *state, pic_value obj, bool tailpos)
ARGC_ASSERT_GE(0); ARGC_ASSERT_GE(0);
switch (pic_length(pic, obj)) { switch (pic_length(pic, obj)) {
case 1: case 1:
return pic_list2(pic, pic_symbol_value(pic->sQUOTE), pic_int_value(0)); return pic_list2(pic, pic_sym_value(pic->sQUOTE), pic_int_value(0));
case 2: case 2:
return analyze(state, pic_car(pic, pic_cdr(pic, obj)), tailpos); return analyze(state, pic_car(pic, pic_cdr(pic, obj)), tailpos);
default: default:
@ -610,7 +610,7 @@ analyze_sub(analyze_state *state, pic_value obj)
ARGC_ASSERT_GE(1); ARGC_ASSERT_GE(1);
switch (pic_length(pic, obj)) { switch (pic_length(pic, obj)) {
case 2: case 2:
return pic_list2(pic, pic_symbol_value(pic->sMINUS), return pic_list2(pic, pic_sym_value(pic->sMINUS),
analyze(state, pic_car(pic, pic_cdr(pic, obj)), false)); analyze(state, pic_car(pic, pic_cdr(pic, obj)), false));
default: default:
args = pic_cdr(pic, obj); args = pic_cdr(pic, obj);
@ -628,7 +628,7 @@ analyze_mul(analyze_state *state, pic_value obj, bool tailpos)
ARGC_ASSERT_GE(0); ARGC_ASSERT_GE(0);
switch (pic_length(pic, obj)) { switch (pic_length(pic, obj)) {
case 1: case 1:
return pic_list2(pic, pic_symbol_value(pic->sQUOTE), pic_int_value(1)); return pic_list2(pic, pic_sym_value(pic->sQUOTE), pic_int_value(1));
case 2: case 2:
return analyze(state, pic_car(pic, pic_cdr(pic, obj)), tailpos); return analyze(state, pic_car(pic, pic_cdr(pic, obj)), tailpos);
default: default:
@ -669,7 +669,7 @@ analyze_call(analyze_state *state, pic_value obj, bool tailpos)
} else { } else {
call = state->sTAILCALL; call = state->sTAILCALL;
} }
seq = pic_list1(pic, pic_symbol_value(call)); seq = pic_list1(pic, pic_sym_value(call));
pic_for_each (elt, obj) { pic_for_each (elt, obj) {
seq = pic_cons(pic, analyze(state, elt, false), seq); seq = pic_cons(pic, analyze(state, elt, false), seq);
} }
@ -686,7 +686,7 @@ analyze_values(analyze_state *state, pic_value obj, bool tailpos)
return analyze_call(state, obj, false); return analyze_call(state, obj, false);
} }
seq = pic_list1(pic, pic_symbol_value(state->sRETURN)); seq = pic_list1(pic, pic_sym_value(state->sRETURN));
pic_for_each (v, pic_cdr(pic, obj)) { pic_for_each (v, pic_cdr(pic, obj)) {
seq = pic_cons(pic, analyze(state, v, false), seq); seq = pic_cons(pic, analyze(state, v, false), seq);
} }
@ -711,31 +711,31 @@ analyze_call_with_values(analyze_state *state, pic_value obj, bool tailpos)
} }
prod = analyze(state, pic_list_ref(pic, obj, 1), false); prod = analyze(state, pic_list_ref(pic, obj, 1), false);
cnsm = analyze(state, pic_list_ref(pic, obj, 2), false); cnsm = analyze(state, pic_list_ref(pic, obj, 2), false);
return pic_list3(pic, pic_symbol_value(call), prod, cnsm); return pic_list3(pic, pic_sym_value(call), prod, cnsm);
} }
#define ARGC_ASSERT(n) do { \ #define ARGC_ASSERT(n) do { \
if (pic_length(pic, obj) != (n) + 1) { \ if (pic_length(pic, obj) != (n) + 1) { \
pic_errorf(pic, "wrong number of arguments"); \ pic_errorf(pic, "wrong number of arguments"); \
} \ } \
} while (0) } while (0)
#define ARGC_ASSERT_WITH_FALLBACK(n) do { \ #define ARGC_ASSERT_WITH_FALLBACK(n) do { \
if (pic_length(pic, obj) != (n) + 1) { \ if (pic_length(pic, obj) != (n) + 1) { \
goto fallback; \ goto fallback; \
} \ } \
} while (0) } while (0)
#define CONSTRUCT_OP1(op) \ #define CONSTRUCT_OP1(op) \
pic_list2(pic, \ pic_list2(pic, \
pic_symbol_value(op), \ pic_sym_value(op), \
analyze(state, pic_list_ref(pic, obj, 1), false)) analyze(state, pic_list_ref(pic, obj, 1), false))
#define CONSTRUCT_OP2(op) \ #define CONSTRUCT_OP2(op) \
pic_list3(pic, \ pic_list3(pic, \
pic_symbol_value(op), \ pic_sym_value(op), \
analyze(state, pic_list_ref(pic, obj, 1), false), \ analyze(state, pic_list_ref(pic, obj, 1), false), \
analyze(state, pic_list_ref(pic, obj, 2), false)) analyze(state, pic_list_ref(pic, obj, 2), false))
static pic_value static pic_value
analyze_node(analyze_state *state, pic_value obj, bool tailpos) analyze_node(analyze_state *state, pic_value obj, bool tailpos)
@ -842,12 +842,12 @@ analyze_node(analyze_state *state, pic_value obj, bool tailpos)
return analyze_call_with_values(state, obj, tailpos); return analyze_call_with_values(state, obj, tailpos);
} }
} }
fallback: fallback:
return analyze_call(state, obj, tailpos); return analyze_call(state, obj, tailpos);
} }
default: default:
return pic_list2(pic, pic_symbol_value(pic->sQUOTE), obj); return pic_list2(pic, pic_sym_value(pic->sQUOTE), obj);
} }
} }

1
extlib/benz/include/picrin.h
View File

@ -52,7 +52,6 @@ extern "C" {
#include "picrin/value.h" #include "picrin/value.h"
#define pic_sym(v) pic_ptr(v) #define pic_sym(v) pic_ptr(v)
#define pic_symbol_value(v) pic_sym_value(v)
#define pic_sym_value(v) pic_obj_value(v) #define pic_sym_value(v) pic_obj_value(v)
#define pic_sym_p(v) (pic_type(v) == PIC_TT_SYMBOL) #define pic_sym_p(v) (pic_type(v) == PIC_TT_SYMBOL)

2
extlib/benz/write.c
View File

@ -17,7 +17,7 @@ is_tagged(pic_state *pic, pic_sym tag, pic_value pair)
{ {
return pic_pair_p(pic_cdr(pic, pair)) return pic_pair_p(pic_cdr(pic, pair))
&& pic_nil_p(pic_cddr(pic, pair)) && pic_nil_p(pic_cddr(pic, pair))
&& pic_eq_p(pic_car(pic, pair), pic_symbol_value(tag)); && pic_eq_p(pic_car(pic, pair), pic_sym_value(tag));
} }
static bool static bool