mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-12-26 00:10:27 +00:00
Code Issues 1 Releases Wiki Activity

Make amalg build cleaner.

Browse Source 
Don't pull in a global header <janet/janet.h> unless we need to.
This commit is contained in:
Calvin Rose 2019-02-16 23:33:24 -05:00
parent c715912ea3
commit 6d5ff43de7
3 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/boot/boot.janet
View File

@ -25,14 +25,16 @@
# Create C source file that contains images a uint8_t buffer. This # Create C source file that contains images a uint8_t buffer. This
# can be compiled and linked statically into the main janet library # can be compiled and linked statically into the main janet library
# and example client. # and example client.
(def chunks (seq [b :in image] (string b))) (def chunks (string/bytes image))
(def image-file (file/open "build/core_image.c" :w)) (def image-file (file/open "build/core_image.c" :w))
(file/write image-file (file/write image-file
"#ifndef JANET_AMALG\n"
"#include <janet/janet.h>\n" "#include <janet/janet.h>\n"
"static const unsigned char janet_core_image_bytes[] = {") "#endif\n"
(loop [line :in (partition 16 chunks)] "static const unsigned char janet_core_image_bytes[] = {\n")
(def str (string ;(interpose ", " line))) (loop [line :in (partition 10 chunks)]
(file/write image-file str ",\n")) (def str (string ;(interpose ", " (map (partial string/format "0x%.2X") line))))
(file/write image-file " " str ",\n"))
(file/write image-file (file/write image-file
"0};\n\n" "0};\n\n"
"const unsigned char *janet_core_image = janet_core_image_bytes;\n" "const unsigned char *janet_core_image = janet_core_image_bytes;\n"

42
src/core/peg.c
View File

@ -478,7 +478,7 @@ typedef struct {
} Builder; } Builder;
/* Forward declaration to allow recursion */ /* Forward declaration to allow recursion */
static uint32_t compile1(Builder *b, Janet peg); static uint32_t peg_compile1(Builder *b, Janet peg);
/* /*
* Errors * Errors
@ -664,7 +664,7 @@ static void spec_look(Builder *b, int32_t argc, const Janet *argv) {
Reserve r = reserve(b, 3); Reserve r = reserve(b, 3);
int32_t rulearg = argc == 2 ? 1 : 0; int32_t rulearg = argc == 2 ? 1 : 0;
int32_t offset = argc == 2 ? peg_getinteger(b, argv[0]) : 0; int32_t offset = argc == 2 ? peg_getinteger(b, argv[0]) : 0;
uint32_t subrule = compile1(b, argv[rulearg]); uint32_t subrule = peg_compile1(b, argv[rulearg]);
emit_2(r, RULE_LOOK, (uint32_t) offset, subrule); emit_2(r, RULE_LOOK, (uint32_t) offset, subrule);
} }
@ -676,7 +676,7 @@ static void spec_variadic(Builder *b, int32_t argc, const Janet *argv, uint32_t
for (int32_t i = 0; i < argc; i++) for (int32_t i = 0; i < argc; i++)
janet_v_push(b->bytecode, 0); janet_v_push(b->bytecode, 0);
for (int32_t i = 0; i < argc; i++) { for (int32_t i = 0; i < argc; i++) {
uint32_t rulei = compile1(b, argv[i]); uint32_t rulei = peg_compile1(b, argv[i]);
b->bytecode[rule + 2 + i] = rulei; b->bytecode[rule + 2 + i] = rulei;
} }
} }
@ -692,8 +692,8 @@ static void spec_sequence(Builder *b, int32_t argc, const Janet *argv) {
static void spec_branch(Builder *b, int32_t argc, const Janet *argv, uint32_t rule) { static void spec_branch(Builder *b, int32_t argc, const Janet *argv, uint32_t rule) {
peg_fixarity(b, argc, 2); peg_fixarity(b, argc, 2);
Reserve r = reserve(b, 3); Reserve r = reserve(b, 3);
uint32_t rule_a = compile1(b, argv[0]); uint32_t rule_a = peg_compile1(b, argv[0]);
uint32_t rule_b = compile1(b, argv[1]); uint32_t rule_b = peg_compile1(b, argv[1]);
emit_2(r, rule, rule_a, rule_b); emit_2(r, rule, rule_a, rule_b);
} }
@ -709,14 +709,14 @@ static void spec_between(Builder *b, int32_t argc, const Janet *argv) {
Reserve r = reserve(b, 4); Reserve r = reserve(b, 4);
int32_t lo = peg_getnat(b, argv[0]); int32_t lo = peg_getnat(b, argv[0]);
int32_t hi = peg_getnat(b, argv[1]); int32_t hi = peg_getnat(b, argv[1]);
uint32_t subrule = compile1(b, argv[2]); uint32_t subrule = peg_compile1(b, argv[2]);
emit_3(r, RULE_BETWEEN, lo, hi, subrule); emit_3(r, RULE_BETWEEN, lo, hi, subrule);
} }
static void spec_repeater(Builder *b, int32_t argc, const Janet *argv, int32_t min) { static void spec_repeater(Builder *b, int32_t argc, const Janet *argv, int32_t min) {
peg_fixarity(b, argc, 1); peg_fixarity(b, argc, 1);
Reserve r = reserve(b, 4); Reserve r = reserve(b, 4);
uint32_t subrule = compile1(b, argv[0]); uint32_t subrule = peg_compile1(b, argv[0]);
emit_3(r, RULE_BETWEEN, min, UINT32_MAX, subrule); emit_3(r, RULE_BETWEEN, min, UINT32_MAX, subrule);
} }
@ -731,7 +731,7 @@ static void spec_atleast(Builder *b, int32_t argc, const Janet *argv) {
peg_fixarity(b, argc, 2); peg_fixarity(b, argc, 2);
Reserve r = reserve(b, 4); Reserve r = reserve(b, 4);
int32_t n = peg_getnat(b, argv[0]); int32_t n = peg_getnat(b, argv[0]);
uint32_t subrule = compile1(b, argv[1]); uint32_t subrule = peg_compile1(b, argv[1]);
emit_3(r, RULE_BETWEEN, n, UINT32_MAX, subrule); emit_3(r, RULE_BETWEEN, n, UINT32_MAX, subrule);
} }
@ -739,14 +739,14 @@ static void spec_atmost(Builder *b, int32_t argc, const Janet *argv) {
peg_fixarity(b, argc, 2); peg_fixarity(b, argc, 2);
Reserve r = reserve(b, 4); Reserve r = reserve(b, 4);
int32_t n = peg_getnat(b, argv[0]); int32_t n = peg_getnat(b, argv[0]);
uint32_t subrule = compile1(b, argv[1]); uint32_t subrule = peg_compile1(b, argv[1]);
emit_3(r, RULE_BETWEEN, 0, n, subrule); emit_3(r, RULE_BETWEEN, 0, n, subrule);
} }
static void spec_opt(Builder *b, int32_t argc, const Janet *argv) { static void spec_opt(Builder *b, int32_t argc, const Janet *argv) {
peg_fixarity(b, argc, 1); peg_fixarity(b, argc, 1);
Reserve r = reserve(b, 4); Reserve r = reserve(b, 4);
uint32_t subrule = compile1(b, argv[0]); uint32_t subrule = peg_compile1(b, argv[0]);
emit_3(r, RULE_BETWEEN, 0, 1, subrule); emit_3(r, RULE_BETWEEN, 0, 1, subrule);
} }
@ -755,7 +755,7 @@ static void spec_opt(Builder *b, int32_t argc, const Janet *argv) {
static void spec_onerule(Builder *b, int32_t argc, const Janet *argv, uint32_t op) { static void spec_onerule(Builder *b, int32_t argc, const Janet *argv, uint32_t op) {
peg_fixarity(b, argc, 1); peg_fixarity(b, argc, 1);
Reserve r = reserve(b, 2); Reserve r = reserve(b, 2);
uint32_t rule = compile1(b, argv[0]); uint32_t rule = peg_compile1(b, argv[0]);
emit_1(r, op, rule); emit_1(r, op, rule);
} }
@ -774,7 +774,7 @@ static void spec_cap1(Builder *b, int32_t argc, const Janet *argv, uint32_t op)
peg_arity(b, argc, 1, 2); peg_arity(b, argc, 1, 2);
Reserve r = reserve(b, 3); Reserve r = reserve(b, 3);
uint32_t tag = (argc == 2) ? emit_tag(b, argv[1]) : 0; uint32_t tag = (argc == 2) ? emit_tag(b, argv[1]) : 0;
uint32_t rule = compile1(b, argv[0]); uint32_t rule = peg_compile1(b, argv[0]);
emit_2(r, op, rule, tag); emit_2(r, op, rule, tag);
} }
@ -822,7 +822,7 @@ static void spec_constant(Builder *b, int32_t argc, const Janet *argv) {
static void spec_replace(Builder *b, int32_t argc, const Janet *argv) { static void spec_replace(Builder *b, int32_t argc, const Janet *argv) {
peg_arity(b, argc, 2, 3); peg_arity(b, argc, 2, 3);
Reserve r = reserve(b, 4); Reserve r = reserve(b, 4);
uint32_t subrule = compile1(b, argv[0]); uint32_t subrule = peg_compile1(b, argv[0]);
uint32_t constant = emit_constant(b, argv[1]); uint32_t constant = emit_constant(b, argv[1]);
uint32_t tag = (argc == 3) ? emit_tag(b, argv[2]) : 0; uint32_t tag = (argc == 3) ? emit_tag(b, argv[2]) : 0;
emit_3(r, RULE_REPLACE, subrule, constant, tag); emit_3(r, RULE_REPLACE, subrule, constant, tag);
@ -831,7 +831,7 @@ static void spec_replace(Builder *b, int32_t argc, const Janet *argv) {
static void spec_matchtime(Builder *b, int32_t argc, const Janet *argv) { static void spec_matchtime(Builder *b, int32_t argc, const Janet *argv) {
peg_arity(b, argc, 2, 3); peg_arity(b, argc, 2, 3);
Reserve r = reserve(b, 4); Reserve r = reserve(b, 4);
uint32_t subrule = compile1(b, argv[0]); uint32_t subrule = peg_compile1(b, argv[0]);
Janet fun = argv[1]; Janet fun = argv[1];
if (!janet_checktype(fun, JANET_FUNCTION) && if (!janet_checktype(fun, JANET_FUNCTION) &&
!janet_checktype(fun, JANET_CFUNCTION)) { !janet_checktype(fun, JANET_CFUNCTION)) {
@ -850,7 +850,7 @@ typedef struct {
} SpecialPair; } SpecialPair;
/* Keep in lexical order (vim :sort works well) */ /* Keep in lexical order (vim :sort works well) */
static const SpecialPair specials[] = { static const SpecialPair peg_specials[] = {
{"!", spec_not}, {"!", spec_not},
{"$", spec_position}, {"$", spec_position},
{"%", spec_accumulate}, {"%", spec_accumulate},
@ -890,7 +890,7 @@ static const SpecialPair specials[] = {
}; };
/* Compile a janet value into a rule and return the rule index. */ /* Compile a janet value into a rule and return the rule index. */
static uint32_t compile1(Builder *b, Janet peg) { static uint32_t peg_compile1(Builder *b, Janet peg) {
/* Check for already compiled rules */ /* Check for already compiled rules */
Janet check = janet_table_get(b->memoized, peg); Janet check = janet_table_get(b->memoized, peg);
@ -942,7 +942,7 @@ static uint32_t compile1(Builder *b, Janet peg) {
Janet check = janet_table_get(b->grammar, peg); Janet check = janet_table_get(b->grammar, peg);
if (janet_checktype(check, JANET_NIL)) if (janet_checktype(check, JANET_NIL))
peg_panicf(b, "unknown rule"); peg_panicf(b, "unknown rule");
rule = compile1(b, check); rule = peg_compile1(b, check);
break; break;
} }
case JANET_STRUCT: case JANET_STRUCT:
@ -953,7 +953,7 @@ static uint32_t compile1(Builder *b, Janet peg) {
Janet main_rule = janet_table_get(grammar, janet_ckeywordv("main")); Janet main_rule = janet_table_get(grammar, janet_ckeywordv("main"));
if (janet_checktype(main_rule, JANET_NIL)) if (janet_checktype(main_rule, JANET_NIL))
peg_panicf(b, "grammar requires :main rule"); peg_panicf(b, "grammar requires :main rule");
rule = compile1(b, main_rule); rule = peg_compile1(b, main_rule);
b->grammar = grammar->proto; b->grammar = grammar->proto;
break; break;
} }
@ -966,8 +966,8 @@ static uint32_t compile1(Builder *b, Janet peg) {
peg_panicf(b, "expected grammar command, found %v", tup[0]); peg_panicf(b, "expected grammar command, found %v", tup[0]);
const uint8_t *sym = janet_unwrap_symbol(tup[0]); const uint8_t *sym = janet_unwrap_symbol(tup[0]);
const SpecialPair *sp = janet_strbinsearch( const SpecialPair *sp = janet_strbinsearch(
&specials, &peg_specials,
sizeof(specials)/sizeof(SpecialPair), sizeof(peg_specials)/sizeof(SpecialPair),
sizeof(SpecialPair), sizeof(SpecialPair),
sym); sym);
if (!sp) if (!sp)
@ -1035,7 +1035,7 @@ static Peg *compile_peg(Janet x) {
builder.nexttag = 1; builder.nexttag = 1;
builder.form = x; builder.form = x;
builder.depth = JANET_RECURSION_GUARD; builder.depth = JANET_RECURSION_GUARD;
compile1(&builder, x); peg_compile1(&builder, x);
Peg *peg = make_peg(&builder); Peg *peg = make_peg(&builder);
builder_cleanup(&builder); builder_cleanup(&builder);
return peg; return peg;

1
tools/amalg.janet
View File

@ -72,5 +72,4 @@
(each s sources (dofile s)) (each s sources (dofile s))
# Relies on these files being built # Relies on these files being built
(dofile "build/core.gen.c")
(dofile "build/core_image.c") (dofile "build/core_image.c")