Skip to content

Commit f2f6052

Browse files
ricejasonfricejasonf
committed
[Heavy] Rename base library to (heavy builtins)
1 parent caafb6a commit f2f6052

23 files changed

+100
-100
lines changed

‎heavy/include/heavy/Builtins.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88
//
9-
// This file declares values and functions for the (heavy base) scheme library
9+
// This file declares values and functions for the (heavy builtins) scheme library
1010
//
1111
//===----------------------------------------------------------------------===//
1212

@@ -17,29 +17,29 @@
1717
#include "heavy/Value.h"
1818
#include "llvm/ADT/SmallVector.h"
1919

20-
#define HEAVY_BASE_LIB _HEAVYL5SheavyL4Sbase
21-
#define HEAVY_BASE_LIB_(NAME) _HEAVYL5SheavyL4Sbase ## NAME
22-
#define HEAVY_BASE_LIB_STR "_HEAVYL5SheavyL4Sbase"
20+
#define HEAVY_BASE_LIB _HEAVYL5SheavyL8Sbuiltins
21+
#define HEAVY_BASE_LIB_(NAME) _HEAVYL5SheavyL8Sbuiltins ## NAME
22+
#define HEAVY_BASE_LIB_STR "_HEAVYL5SheavyL8Sbuiltins"
2323
#define HEAVY_BASE_LOAD_MODULE HEAVY_BASE_LIB_(_load_module)
2424
#define HEAVY_BASE_INIT HEAVY_BASE_LIB_(_init)
2525

2626
#define HEAVY_IMPORT_VAR "_HEAVY_import"
2727
#define HEAVY_LOAD_MODULE_VAR "_HEAVY_load_module"
2828

29-
#define HEAVY_BASE_VAR(NAME) ::heavy::base_var::NAME
29+
#define HEAVY_BASE_VAR(NAME) ::heavy::builtins_var::NAME
3030
#define HEAVY_BASE_VAR_STR(NAME) HEAVY_BASE_VAR_STR__##NAME
3131
#define HEAVY_BASE_VAR_STR__error HEAVY_BASE_LIB_STR "5Serror"
3232

3333
// Forward declare vars that are used in the C++ codebase.
34-
namespace heavy::base_var {
34+
namespace heavy::builtins_var {
3535
extern heavy::ContextLocal module_path;
3636
extern heavy::ContextLocal parse_source_file;
3737
extern heavy::ExternFunction compile;
3838
extern heavy::ExternFunction eval;
3939
extern heavy::ExternFunction op_eval;
4040
}
4141

42-
namespace heavy::base {
42+
namespace heavy::builtins {
4343
void eval(Context& C, ValueRefs Args);
4444
void import_(Context& C, ValueRefs Args);
4545
void load_module(Context& C, ValueRefs Args);
@@ -54,7 +54,7 @@ void HEAVY_BASE_INIT(heavy::Context& Context);
5454
void HEAVY_BASE_LOAD_MODULE(heavy::Context& Context);
5555
}
5656

57-
namespace heavy::base {
57+
namespace heavy::builtins {
5858
/* InitParseSourceFile
5959
* - Provide a hook for including source files by
6060
* setting parse-source-file.

‎heavy/lib/Builtins.cpp‎

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace mlir {
2424
class Value;
2525
}
2626

27-
namespace heavy::base_var {
27+
namespace heavy::builtins_var {
2828
heavy::ExternSyntax<> define_library;
2929
heavy::ExternSyntax<> begin;
3030
heavy::ExternSyntax<> export_;
@@ -105,7 +105,7 @@ heavy::ExternFunction is_source_value;
105105

106106
bool HEAVY_BASE_IS_LOADED = false;
107107

108-
namespace heavy::base {
108+
namespace heavy::builtins {
109109
// See Quasiquote.cpp
110110
mlir::Value quote(OpGen& OG, Pair* P);
111111
mlir::Value quasiquote(OpGen& OG, Pair* P);
@@ -358,7 +358,7 @@ void source_loc(Context& C, ValueRefs Args) {
358358
C.Cont(C.CreateSourceValue(Loc));
359359
}
360360

361-
} // end of namespace heavy::base
361+
} // end of namespace heavy::builtins
362362

363363
namespace heavy {
364364
struct NumberOp {
@@ -403,7 +403,7 @@ struct NumberOp {
403403

404404
} // end namespace heavy
405405

406-
namespace heavy::base {
406+
namespace heavy::builtins {
407407
void call_cc(Context& C, ValueRefs Args) {
408408
if (Args.size() != 1) return C.RaiseError("invalid arity");
409409
C.CallCC(Args[0]);
@@ -877,84 +877,84 @@ void is_source_value(Context& C, ValueRefs Args) {
877877
return C.RaiseError("invalid arity");
878878
C.Cont(Bool(isa<heavy::SourceValue>(Args[0])));
879879
}
880-
} // end of namespace heavy::base
880+
} // end of namespace heavy::builtins
881881

882882
// initialize the module for run-time independent of the compiler
883883
void HEAVY_BASE_INIT(heavy::Context& Context) {
884884
Context.DialectRegistry->insert<heavy::Dialect>();
885885
// syntax
886-
HEAVY_BASE_VAR(define) = heavy::base::define;
887-
HEAVY_BASE_VAR(define_syntax) = heavy::base::define_syntax;
888-
HEAVY_BASE_VAR(syntax_rules) = heavy::base::syntax_rules;
886+
HEAVY_BASE_VAR(define) = heavy::builtins::define;
887+
HEAVY_BASE_VAR(define_syntax) = heavy::builtins::define_syntax;
888+
HEAVY_BASE_VAR(syntax_rules) = heavy::builtins::syntax_rules;
889889
HEAVY_BASE_VAR(ir_macro_transformer)
890-
= heavy::base::ir_macro_transformer;
891-
HEAVY_BASE_VAR(if_) = heavy::base::if_;
892-
HEAVY_BASE_VAR(lambda) = heavy::base::lambda;
893-
HEAVY_BASE_VAR(quasiquote) = heavy::base::quasiquote;
894-
HEAVY_BASE_VAR(quote) = heavy::base::quote;
895-
HEAVY_BASE_VAR(set) = heavy::base::set;
896-
HEAVY_BASE_VAR(begin) = heavy::base::begin;
897-
HEAVY_BASE_VAR(cond_expand) = heavy::base::cond_expand;
898-
HEAVY_BASE_VAR(define_library) = heavy::base::define_library;
899-
HEAVY_BASE_VAR(export_) = heavy::base::export_;
900-
HEAVY_BASE_VAR(include) = heavy::base::include_;
901-
HEAVY_BASE_VAR(include_ci) = heavy::base::include_ci;
890+
= heavy::builtins::ir_macro_transformer;
891+
HEAVY_BASE_VAR(if_) = heavy::builtins::if_;
892+
HEAVY_BASE_VAR(lambda) = heavy::builtins::lambda;
893+
HEAVY_BASE_VAR(quasiquote) = heavy::builtins::quasiquote;
894+
HEAVY_BASE_VAR(quote) = heavy::builtins::quote;
895+
HEAVY_BASE_VAR(set) = heavy::builtins::set;
896+
HEAVY_BASE_VAR(begin) = heavy::builtins::begin;
897+
HEAVY_BASE_VAR(cond_expand) = heavy::builtins::cond_expand;
898+
HEAVY_BASE_VAR(define_library) = heavy::builtins::define_library;
899+
HEAVY_BASE_VAR(export_) = heavy::builtins::export_;
900+
HEAVY_BASE_VAR(include) = heavy::builtins::include_;
901+
HEAVY_BASE_VAR(include_ci) = heavy::builtins::include_ci;
902902
HEAVY_BASE_VAR(include_library_declarations)
903-
= heavy::base::include_library_declarations;
904-
HEAVY_BASE_VAR(source_loc) = heavy::base::source_loc;
903+
= heavy::builtins::include_library_declarations;
904+
HEAVY_BASE_VAR(source_loc) = heavy::builtins::source_loc;
905905
HEAVY_BASE_VAR(parse_source_file).init(Context);
906906

907907
// functions
908-
HEAVY_BASE_VAR(add) = heavy::base::add;
909-
HEAVY_BASE_VAR(sub) = heavy::base::sub;
910-
HEAVY_BASE_VAR(div) = heavy::base::div;
911-
HEAVY_BASE_VAR(mul) = heavy::base::mul;
912-
HEAVY_BASE_VAR(gt) = heavy::base::gt;
913-
HEAVY_BASE_VAR(lt) = heavy::base::lt;
914-
HEAVY_BASE_VAR(list) = heavy::base::list;
915-
HEAVY_BASE_VAR(length) = heavy::base::length;
916-
HEAVY_BASE_VAR(cons) = heavy::base::cons;
917-
HEAVY_BASE_VAR(car) = heavy::base::car;
918-
HEAVY_BASE_VAR(cdr) = heavy::base::cdr;
919-
HEAVY_BASE_VAR(append) = heavy::base::append;
920-
HEAVY_BASE_VAR(dump) = heavy::base::dump;
921-
HEAVY_BASE_VAR(write) = heavy::base::write;
922-
HEAVY_BASE_VAR(newline) = heavy::base::newline;
923-
HEAVY_BASE_VAR(string_append) = heavy::base::string_append;
924-
HEAVY_BASE_VAR(string_copy) = heavy::base::string_copy;
925-
HEAVY_BASE_VAR(string_length) = heavy::base::string_length;
926-
HEAVY_BASE_VAR(number_to_string) = heavy::base::number_to_string;
927-
HEAVY_BASE_VAR(eq) = heavy::base::eqv;
928-
HEAVY_BASE_VAR(equal) = heavy::base::equal;
929-
HEAVY_BASE_VAR(eqv) = heavy::base::eqv;
930-
HEAVY_BASE_VAR(call_cc) = heavy::base::call_cc;
931-
HEAVY_BASE_VAR(values) = heavy::base::values;
932-
HEAVY_BASE_VAR(call_with_values) = heavy::base::call_with_values;
908+
HEAVY_BASE_VAR(add) = heavy::builtins::add;
909+
HEAVY_BASE_VAR(sub) = heavy::builtins::sub;
910+
HEAVY_BASE_VAR(div) = heavy::builtins::div;
911+
HEAVY_BASE_VAR(mul) = heavy::builtins::mul;
912+
HEAVY_BASE_VAR(gt) = heavy::builtins::gt;
913+
HEAVY_BASE_VAR(lt) = heavy::builtins::lt;
914+
HEAVY_BASE_VAR(list) = heavy::builtins::list;
915+
HEAVY_BASE_VAR(length) = heavy::builtins::length;
916+
HEAVY_BASE_VAR(cons) = heavy::builtins::cons;
917+
HEAVY_BASE_VAR(car) = heavy::builtins::car;
918+
HEAVY_BASE_VAR(cdr) = heavy::builtins::cdr;
919+
HEAVY_BASE_VAR(append) = heavy::builtins::append;
920+
HEAVY_BASE_VAR(dump) = heavy::builtins::dump;
921+
HEAVY_BASE_VAR(write) = heavy::builtins::write;
922+
HEAVY_BASE_VAR(newline) = heavy::builtins::newline;
923+
HEAVY_BASE_VAR(string_append) = heavy::builtins::string_append;
924+
HEAVY_BASE_VAR(string_copy) = heavy::builtins::string_copy;
925+
HEAVY_BASE_VAR(string_length) = heavy::builtins::string_length;
926+
HEAVY_BASE_VAR(number_to_string) = heavy::builtins::number_to_string;
927+
HEAVY_BASE_VAR(eq) = heavy::builtins::eqv;
928+
HEAVY_BASE_VAR(equal) = heavy::builtins::equal;
929+
HEAVY_BASE_VAR(eqv) = heavy::builtins::eqv;
930+
HEAVY_BASE_VAR(call_cc) = heavy::builtins::call_cc;
931+
HEAVY_BASE_VAR(values) = heavy::builtins::values;
932+
HEAVY_BASE_VAR(call_with_values) = heavy::builtins::call_with_values;
933933
HEAVY_BASE_VAR(with_exception_handler)
934-
= heavy::base::with_exception_handler;
935-
HEAVY_BASE_VAR(raise) = heavy::base::raise;
936-
HEAVY_BASE_VAR(error) = heavy::base::error;
937-
HEAVY_BASE_VAR(dynamic_wind) = heavy::base::dynamic_wind;
938-
939-
HEAVY_BASE_VAR(eval) = heavy::base::eval;
940-
HEAVY_BASE_VAR(op_eval) = heavy::base::op_eval;
941-
HEAVY_BASE_VAR(compile) = heavy::base::compile;
934+
= heavy::builtins::with_exception_handler;
935+
HEAVY_BASE_VAR(raise) = heavy::builtins::raise;
936+
HEAVY_BASE_VAR(error) = heavy::builtins::error;
937+
HEAVY_BASE_VAR(dynamic_wind) = heavy::builtins::dynamic_wind;
938+
939+
HEAVY_BASE_VAR(eval) = heavy::builtins::eval;
940+
HEAVY_BASE_VAR(op_eval) = heavy::builtins::op_eval;
941+
HEAVY_BASE_VAR(compile) = heavy::builtins::compile;
942942
HEAVY_BASE_VAR(module_path).init(Context);
943943

944-
HEAVY_BASE_VAR(is_boolean) = heavy::base::is_boolean;
945-
HEAVY_BASE_VAR(is_bytevector) = heavy::base::is_bytevector;
946-
HEAVY_BASE_VAR(is_char) = heavy::base::is_char;
947-
HEAVY_BASE_VAR(is_eof_object) = heavy::base::is_eof_object;
948-
HEAVY_BASE_VAR(is_null) = heavy::base::is_null;
949-
HEAVY_BASE_VAR(is_number) = heavy::base::is_number;
950-
HEAVY_BASE_VAR(is_pair) = heavy::base::is_pair;
951-
HEAVY_BASE_VAR(is_port) = heavy::base::is_port;
952-
HEAVY_BASE_VAR(is_procedure) = heavy::base::is_procedure;
953-
HEAVY_BASE_VAR(is_string) = heavy::base::is_string;
954-
HEAVY_BASE_VAR(is_symbol) = heavy::base::is_symbol;
955-
HEAVY_BASE_VAR(is_vector) = heavy::base::is_vector;
956-
HEAVY_BASE_VAR(is_mlir_operation) = heavy::base::is_mlir_operation;
957-
HEAVY_BASE_VAR(is_source_value) = heavy::base::is_source_value;
944+
HEAVY_BASE_VAR(is_boolean) = heavy::builtins::is_boolean;
945+
HEAVY_BASE_VAR(is_bytevector) = heavy::builtins::is_bytevector;
946+
HEAVY_BASE_VAR(is_char) = heavy::builtins::is_char;
947+
HEAVY_BASE_VAR(is_eof_object) = heavy::builtins::is_eof_object;
948+
HEAVY_BASE_VAR(is_null) = heavy::builtins::is_null;
949+
HEAVY_BASE_VAR(is_number) = heavy::builtins::is_number;
950+
HEAVY_BASE_VAR(is_pair) = heavy::builtins::is_pair;
951+
HEAVY_BASE_VAR(is_port) = heavy::builtins::is_port;
952+
HEAVY_BASE_VAR(is_procedure) = heavy::builtins::is_procedure;
953+
HEAVY_BASE_VAR(is_string) = heavy::builtins::is_string;
954+
HEAVY_BASE_VAR(is_symbol) = heavy::builtins::is_symbol;
955+
HEAVY_BASE_VAR(is_vector) = heavy::builtins::is_vector;
956+
HEAVY_BASE_VAR(is_mlir_operation) = heavy::builtins::is_mlir_operation;
957+
HEAVY_BASE_VAR(is_source_value) = heavy::builtins::is_source_value;
958958
}
959959

960960
// initializes the module and loads lookup information

‎heavy/lib/Context.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ Context::Context()
8181
OpGen(nullptr)
8282
{
8383
NameForImportVar = HEAVY_IMPORT_VAR;
84-
_HEAVY_import = heavy::base::import_;
84+
_HEAVY_import = heavy::builtins::import_;
8585
NameForLoadModuleVar = HEAVY_LOAD_MODULE_VAR;
86-
_HEAVY_load_module = heavy::base::load_module;
86+
_HEAVY_load_module = heavy::builtins::load_module;
8787
AddKnownAddress(NameForLoadModuleVar.Value.getStringRef(),
8888
_HEAVY_load_module);
8989
RegisterModule(HEAVY_BASE_LIB_STR, HEAVY_BASE_LOAD_MODULE);

‎heavy/lib/OpEval.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@ void OpEvalDeleter::operator()(OpEvalImpl* Ptr) const {
809809
delete Ptr;
810810
}
811811

812-
namespace base {
812+
namespace builtins {
813813
void op_eval(Context& C, ValueRefs Args) {
814814
if (Args.size() != 1) {
815815
return C.RaiseError("invalid arity");

‎heavy/lib/Quasiquote.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ class Quasiquoter : private ValueVisitor<Quasiquoter, heavy::Value> {
224224

225225
}
226226

227-
namespace heavy::base {
227+
namespace heavy::builtins {
228228
mlir::Value quasiquote(OpGen& OG, Pair* P) {
229229
Value Input = GetSingleSyntaxArg(P);
230230
if (!Input) OG.SetError("invalid quasiquote syntax", P);

‎heavy/lib/SourceFileStorage.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ void HeavyScheme::InitSourceFileStorage() {
2727
using PtrTy = decltype(SourceFileStoragePtr);
2828
SourceFileStoragePtr = PtrTy(new SourceFileStorage(),
2929
[](SourceFileStorage* S) { delete S; });
30-
heavy::base::InitParseSourceFile(getContext(),
30+
heavy::builtins::InitParseSourceFile(getContext(),
3131
[this](heavy::Context& C,
3232
heavy::SourceLocation Loc,
3333
heavy::String* Filename) {

‎heavy/test/Evaluate/Inputs/my/lib.sld‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
(import (heavy base))
1+
(import (heavy builtins))
22
(define-library (my lib)
3-
(import (heavy base))
3+
(import (heavy builtins))
44
(import (heavy mlir))
55
(begin
66
(define (hello-module x)

‎heavy/test/Evaluate/begin.scm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
; RUN: heavy-scheme %s | FileCheck %s
2-
(import (heavy base))
2+
(import (heavy builtins))
33

44
; Test top level begin.
55
; CHECK: foo

‎heavy/test/Evaluate/call.scm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; RUN: heavy-scheme %s | FileCheck %s
22

3-
(import (heavy base))
3+
(import (heavy builtins))
44

55
; CHECK: 17
66
(write (+ (+ (+ 2 3) (+ 5 7))))

‎heavy/test/Evaluate/create-op.scm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
; RUN: heavy-scheme %s | FileCheck %s
2-
(import (heavy base))
2+
(import (heavy builtins))
33
(import (heavy mlir))
44

55
(define !heavy.value (type "!heavy.value"))

0 commit comments

Comments
 (0)