ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 15:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

import and import_load as keywords; Fix procedure literal call trick

Browse Source
This commit is contained in:
Ginger Bill
2017-06-12 14:19:12 +01:00
parent 0c05fc1432
commit 2ab0d97573
18 changed files with 156 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/demo.odin
+15 -16
View File
@@ -1,19 +1,18 @@
#import "fmt.odin"; import "fmt.odin";
#import "atomics.odin"; import "atomics.odin";
#import "bits.odin"; import "bits.odin";
#import "math.odin"; import "math.odin";
#import "mem.odin"; import "mem.odin";
#import "opengl.odin"; import "opengl.odin";
#import "strconv.odin"; import "strconv.odin";
#import "strings.odin"; import "strings.odin";
#import "sync.odin"; import "sync.odin";
#import "types.odin"; import "types.odin";
#import "utf8.odin"; import "utf8.odin";
#import "utf16.odin"; import "utf16.odin";
proc main() { proc main() {
var x = proc() { proc(s: string){
fmt.println("Hello"); fmt.println(s, "world!");
}; }("Hellope");
x();
} }
core/_preload.odin
+4 -4
View File
@@ -1,9 +1,9 @@
#shared_global_scope; #shared_global_scope;
#import "os.odin"; import "os.odin";
#import "fmt.odin"; import "fmt.odin";
#import "utf8.odin"; import "utf8.odin";
#import "raw.odin"; import "raw.odin";
// Naming Conventions: // Naming Conventions:
// In general, PascalCase for types and snake_case for values // In general, PascalCase for types and snake_case for values
core/atomics.odin
+1 -1
View File
@@ -1,7 +1,7 @@
// TODO(bill): Use assembly instead here to implement atomics // TODO(bill): Use assembly instead here to implement atomics
// Inline vs external file? // Inline vs external file?
#import win32 "sys/windows.odin" when ODIN_OS == "windows"; import win32 "sys/windows.odin" when ODIN_OS == "windows";
var _ = compile_assert(ODIN_ARCH == "amd64"); // TODO(bill): x86 version var _ = compile_assert(ODIN_ARCH == "amd64"); // TODO(bill): x86 version
core/fmt.odin
+6 -6
View File
@@ -1,9 +1,9 @@
#import "os.odin"; import "os.odin";
#import "mem.odin"; import "mem.odin";
#import "utf8.odin"; import "utf8.odin";
#import "types.odin"; import "types.odin";
#import "strconv.odin"; import "strconv.odin";
#import "raw.odin"; import "raw.odin";
const _BUFFER_SIZE = 1<<12; const _BUFFER_SIZE = 1<<12;
core/mem.odin
+2 -2
View File
@@ -1,5 +1,5 @@
#import "fmt.odin"; import "fmt.odin";
#import "os.odin"; import "os.odin";
proc swap(b: u16) -> u16 #foreign __llvm_core "llvm.bswap.i16"; proc swap(b: u16) -> u16 #foreign __llvm_core "llvm.bswap.i16";
proc swap(b: u32) -> u32 #foreign __llvm_core "llvm.bswap.i32"; proc swap(b: u32) -> u32 #foreign __llvm_core "llvm.bswap.i32";
core/opengl.odin
+3 -3
View File
@@ -1,8 +1,8 @@
#foreign_system_library lib "opengl32.lib" when ODIN_OS == "windows"; #foreign_system_library lib "opengl32.lib" when ODIN_OS == "windows";
#foreign_system_library lib "gl" when ODIN_OS == "linux"; #foreign_system_library lib "gl" when ODIN_OS == "linux";
#import win32 "sys/windows.odin" when ODIN_OS == "windows"; import win32 "sys/windows.odin" when ODIN_OS == "windows";
#import "sys/wgl.odin" when ODIN_OS == "windows"; import "sys/wgl.odin" when ODIN_OS == "windows";
#load "opengl_constants.odin"; import_load "opengl_constants.odin";
proc Clear (mask: u32) #foreign lib "glClear"; proc Clear (mask: u32) #foreign lib "glClear";
proc ClearColor (r, g, b, a: f32) #foreign lib "glClearColor"; proc ClearColor (r, g, b, a: f32) #foreign lib "glClearColor";
core/os.odin
+3 -3
View File
@@ -1,6 +1,6 @@
#load "os_windows.odin" when ODIN_OS == "windows"; import_load "os_windows.odin" when ODIN_OS == "windows";
#load "os_x.odin" when ODIN_OS == "osx"; import_load "os_x.odin" when ODIN_OS == "osx";
#load "os_linux.odin" when ODIN_OS == "linux"; import_load "os_linux.odin" when ODIN_OS == "linux";
proc write_string(fd: Handle, str: string) -> (int, Errno) { proc write_string(fd: Handle, str: string) -> (int, Errno) {
return write(fd, []u8(str)); return write(fd, []u8(str));
core/os_linux.odin
+1 -2
View File
@@ -1,5 +1,4 @@
// #import "fmt.odin"; import "strings.odin";
#import "strings.odin";
type Handle i32; type Handle i32;
type FileTime u64; type FileTime u64;
core/os_windows.odin
+1 -1
View File
@@ -1,4 +1,4 @@
#import win32 "sys/windows.odin"; import win32 "sys/windows.odin";
type Handle int; type Handle int;
type FileTime u64; type FileTime u64;
core/os_x.odin
+2 -2
View File
@@ -1,5 +1,5 @@
#import "fmt.odin"; import "fmt.odin";
#import "strings.odin"; import "strings.odin";
type Handle i32; type Handle i32;
type FileTime u64; type FileTime u64;
core/strconv.odin
+1 -1
View File
@@ -1,4 +1,4 @@
#import . "decimal.odin"; import . "decimal.odin";
type IntFlag enum { type IntFlag enum {
Prefix = 1<<0, Prefix = 1<<0,
core/sync.odin
+2 -2
View File
@@ -1,2 +1,2 @@
#load "sync_windows.odin" when ODIN_OS == "windows"; import_load "sync_windows.odin" when ODIN_OS == "windows";
#load "sync_linux.odin" when ODIN_OS == "linux"; import_load "sync_linux.odin" when ODIN_OS == "linux";
core/sync_linux.odin
+2 -2
View File
@@ -1,5 +1,5 @@
#import "atomics.odin"; import "atomics.odin";
#import "os.odin"; import "os.odin";
type Semaphore struct { type Semaphore struct {
// _handle: win32.Handle, // _handle: win32.Handle,
core/sync_windows.odin
+2 -2
View File
@@ -1,5 +1,5 @@
#import win32 "sys/windows.odin" when ODIN_OS == "windows"; import win32 "sys/windows.odin" when ODIN_OS == "windows";
#import "atomics.odin"; import "atomics.odin";
type Semaphore struct { type Semaphore struct {
_handle: win32.Handle, _handle: win32.Handle,
core/sys/wgl.odin
+1 -1
View File
@@ -1,5 +1,5 @@
#foreign_system_library "opengl32.lib" when ODIN_OS == "windows"; #foreign_system_library "opengl32.lib" when ODIN_OS == "windows";
#import . "windows.odin"; import . "windows.odin";
const CONTEXT_MAJOR_VERSION_ARB = 0x2091; const CONTEXT_MAJOR_VERSION_ARB = 0x2091;
const CONTEXT_MINOR_VERSION_ARB = 0x2092; const CONTEXT_MINOR_VERSION_ARB = 0x2092;
src/check_expr.cpp
+1 -1
View File
@@ -5510,7 +5510,7 @@ ExprKind check_expr_base_internal(Checker *c, Operand *o, AstNode *node, Type *t
check_open_scope(c, pl->type); check_open_scope(c, pl->type);
{ {
decl = make_declaration_info(c->allocator, c->context.scope, c->context.decl); decl = make_declaration_info(c->allocator, c->context.scope, c->context.decl);
decl->proc_decl = pl->type; decl->proc_decl = node;
c->context.decl = decl; c->context.decl = decl;
if (pl->tags != 0) { if (pl->tags != 0) {
src/parser.cpp
+72 -60
View File
@@ -48,7 +48,7 @@ struct AstFile {
struct ImportedFile { struct ImportedFile {
String path; String path;
String rel_path; String rel_path;
TokenPos pos; // #import TokenPos pos; // import
}; };
struct Parser { struct Parser {
@@ -2098,7 +2098,7 @@ AstNode *parse_operand(AstFile *f, bool lhs) {
// Parse Procedure Type or Literal // Parse Procedure Type or Literal
case Token_proc: { case Token_proc: {
Token token = f->curr_token; next_token(f); Token token = expect_token(f, Token_proc);
AstNode *foreign_library = NULL; AstNode *foreign_library = NULL;
String foreign_name = {}; String foreign_name = {};
String link_name = {}; String link_name = {};
@@ -2582,12 +2582,18 @@ AstNode *parse_value_decl(AstFile *f, Token token) {
} }
AstNode *parse_proc_decl(AstFile *f) { AstNode *parse_proc_decl(AstFile *f) {
TokenKind look_ahead = look_ahead_token_kind(f, 1);
if (look_ahead != Token_Ident) {
return ast_expr_stmt(f, parse_expr(f, true));
}
Token token = expect_token(f, Token_proc); Token token = expect_token(f, Token_proc);
AstNode *body = NULL; AstNode *body = NULL;
AstNode *foreign_library = NULL; AstNode *foreign_library = NULL;
String foreign_name = {}; String foreign_name = {};
String link_name = {}; String link_name = {};
AstNode *name = parse_ident(f); AstNode *name = parse_ident(f);
AstNode *type = parse_proc_type(f, token, &foreign_library, &foreign_name, &link_name); AstNode *type = parse_proc_type(f, token, &foreign_library, &foreign_name, &link_name);
u64 tags = type->ProcType.tags; u64 tags = type->ProcType.tags;
@@ -3840,69 +3846,75 @@ AstNode *parse_stmt(AstFile *f) {
return ast_push_context(f, token, expr, body); return ast_push_context(f, token, expr, body);
} break; } break;
case Token_import: {
Token token = expect_token(f, Token_import);
AstNode *cond = NULL;
Token import_name = {};
switch (f->curr_token.kind) {
case Token_Period:
import_name = f->curr_token;
import_name.kind = Token_Ident;
next_token(f);
break;
case Token_Ident:
import_name = f->curr_token;
next_token(f);
break;
default:
import_name.pos = f->curr_token.pos;
break;
}
if (import_name.string == "_") {
syntax_error(import_name, "Illegal import name: `_`");
}
Token file_path = expect_token_after(f, Token_String, "import");
if (allow_token(f, Token_when)) {
cond = parse_expr(f, false);
}
AstNode *decl = NULL;
if (f->curr_proc != NULL) {
syntax_error(import_name, "You cannot use `import` within a procedure. This must be done at the file scope");
decl = ast_bad_decl(f, import_name, file_path);
} else {
decl = ast_import_decl(f, token, true, file_path, import_name, cond);
}
expect_semicolon(f, decl);
return decl;
}
case Token_import_load: {
Token token = expect_token(f, Token_import_load);
AstNode *cond = NULL;
Token file_path = expect_token_after(f, Token_String, "import_load");
Token import_name = file_path;
import_name.string = str_lit(".");
if (allow_token(f, Token_when)) {
cond = parse_expr(f, false);
}
AstNode *decl = NULL;
if (f->curr_proc != NULL) {
syntax_error(import_name, "You cannot use `import_load` within a procedure. This must be done at the file scope");
decl = ast_bad_decl(f, import_name, file_path);
} else {
decl = ast_import_decl(f, token, false, file_path, import_name, cond);
}
expect_semicolon(f, decl);
return decl;
}
case Token_Hash: { case Token_Hash: {
AstNode *s = NULL; AstNode *s = NULL;
Token hash_token = expect_token(f, Token_Hash); Token hash_token = expect_token(f, Token_Hash);
Token name = expect_token(f, Token_Ident); Token name = expect_token(f, Token_Ident);
String tag = name.string; String tag = name.string;
if (tag == "import") { if (tag == "shared_global_scope") {
AstNode *cond = NULL;
Token import_name = {};
switch (f->curr_token.kind) {
case Token_Period:
import_name = f->curr_token;
import_name.kind = Token_Ident;
next_token(f);
break;
case Token_Ident:
import_name = f->curr_token;
next_token(f);
break;
default:
import_name.pos = f->curr_token.pos;
break;
}
if (import_name.string == "_") {
syntax_error(import_name, "Illegal #import name: `_`");
}
Token file_path = expect_token_after(f, Token_String, "#import");
if (allow_token(f, Token_when)) {
cond = parse_expr(f, false);
}
AstNode *decl = NULL;
if (f->curr_proc != NULL) {
syntax_error(import_name, "You cannot use `#import` within a procedure. This must be done at the file scope");
decl = ast_bad_decl(f, import_name, file_path);
} else {
decl = ast_import_decl(f, hash_token, true, file_path, import_name, cond);
}
expect_semicolon(f, decl);
return decl;
} else if (tag == "load") {
AstNode *cond = NULL;
Token file_path = expect_token_after(f, Token_String, "#load");
Token import_name = file_path;
import_name.string = str_lit(".");
if (allow_token(f, Token_when)) {
cond = parse_expr(f, false);
}
AstNode *decl = NULL;
if (f->curr_proc != NULL) {
syntax_error(import_name, "You cannot use `#load` within a procedure. This must be done at the file scope");
decl = ast_bad_decl(f, import_name, file_path);
} else {
decl = ast_import_decl(f, hash_token, false, file_path, import_name, cond);
}
expect_semicolon(f, decl);
return decl;
} else if (tag == "shared_global_scope") {
if (f->curr_proc == NULL) { if (f->curr_proc == NULL) {
f->is_global_scope = true; f->is_global_scope = true;
s = ast_empty_stmt(f, f->curr_token); s = ast_empty_stmt(f, f->curr_token);
@@ -4007,7 +4019,7 @@ AstNode *parse_stmt(AstFile *f) {
} }
if (tag == "include") { if (tag == "include") {
syntax_error(token, "#include is not a valid import declaration kind. Use #load instead"); syntax_error(token, "#include is not a valid import declaration kind. Use import_load instead");
s = ast_bad_stmt(f, token, f->curr_token); s = ast_bad_stmt(f, token, f->curr_token);
} else { } else {
syntax_error(token, "Unknown tag directive used: `%.*s`", LIT(tag)); syntax_error(token, "Unknown tag directive used: `%.*s`", LIT(tag));
src/tokenizer.cpp
+37 -35
View File
@@ -82,41 +82,43 @@ TOKEN_KIND(Token__ComparisonEnd, "_ComparisonEnd"), \
TOKEN_KIND(Token__OperatorEnd, "_OperatorEnd"), \ TOKEN_KIND(Token__OperatorEnd, "_OperatorEnd"), \
\ \
TOKEN_KIND(Token__KeywordBegin, "_KeywordBegin"), \ TOKEN_KIND(Token__KeywordBegin, "_KeywordBegin"), \
TOKEN_KIND(Token_var, "var"), \ TOKEN_KIND(Token_var, "var"), \
TOKEN_KIND(Token_let, "let"), \ TOKEN_KIND(Token_let, "let"), \
TOKEN_KIND(Token_const, "const"), \ TOKEN_KIND(Token_const, "const"), \
TOKEN_KIND(Token_type, "type"), \ TOKEN_KIND(Token_type, "type"), \
TOKEN_KIND(Token_when, "when"), \ TOKEN_KIND(Token_import, "import"), \
TOKEN_KIND(Token_if, "if"), \ TOKEN_KIND(Token_import_load, "import_load"), \
TOKEN_KIND(Token_else, "else"), \ TOKEN_KIND(Token_when, "when"), \
TOKEN_KIND(Token_for, "for"), \ TOKEN_KIND(Token_if, "if"), \
TOKEN_KIND(Token_in, "in"), \ TOKEN_KIND(Token_else, "else"), \
TOKEN_KIND(Token_match, "match"), \ TOKEN_KIND(Token_for, "for"), \
TOKEN_KIND(Token_case, "case"), \ TOKEN_KIND(Token_in, "in"), \
TOKEN_KIND(Token_break, "break"), \ TOKEN_KIND(Token_match, "match"), \
TOKEN_KIND(Token_continue, "continue"), \ TOKEN_KIND(Token_case, "case"), \
TOKEN_KIND(Token_fallthrough, "fallthrough"), \ TOKEN_KIND(Token_break, "break"), \
TOKEN_KIND(Token_defer, "defer"), \ TOKEN_KIND(Token_continue, "continue"), \
TOKEN_KIND(Token_return, "return"), \ TOKEN_KIND(Token_fallthrough, "fallthrough"), \
TOKEN_KIND(Token_proc, "proc"), \ TOKEN_KIND(Token_defer, "defer"), \
TOKEN_KIND(Token_macro, "macro"), \ TOKEN_KIND(Token_return, "return"), \
TOKEN_KIND(Token_struct, "struct"), \ TOKEN_KIND(Token_proc, "proc"), \
TOKEN_KIND(Token_union, "union"), \ TOKEN_KIND(Token_macro, "macro"), \
TOKEN_KIND(Token_raw_union, "raw_union"), \ TOKEN_KIND(Token_struct, "struct"), \
TOKEN_KIND(Token_enum, "enum"), \ TOKEN_KIND(Token_union, "union"), \
TOKEN_KIND(Token_bit_field, "bit_field"), \ TOKEN_KIND(Token_raw_union, "raw_union"), \
TOKEN_KIND(Token_vector, "vector"), \ TOKEN_KIND(Token_enum, "enum"), \
TOKEN_KIND(Token_static, "static"), \ TOKEN_KIND(Token_bit_field, "bit_field"), \
TOKEN_KIND(Token_dynamic, "dynamic"), \ TOKEN_KIND(Token_vector, "vector"), \
TOKEN_KIND(Token_map, "map"), \ TOKEN_KIND(Token_static, "static"), \
TOKEN_KIND(Token_using, "using"), \ TOKEN_KIND(Token_dynamic, "dynamic"), \
TOKEN_KIND(Token_context, "context"), \ TOKEN_KIND(Token_map, "map"), \
TOKEN_KIND(Token_push_context, "push_context"), \ TOKEN_KIND(Token_using, "using"), \
TOKEN_KIND(Token_push_allocator, "push_allocator"), \ TOKEN_KIND(Token_context, "context"), \
TOKEN_KIND(Token_asm, "asm"), \ TOKEN_KIND(Token_push_context, "push_context"), \
TOKEN_KIND(Token_yield, "yield"), \ TOKEN_KIND(Token_push_allocator, "push_allocator"), \
TOKEN_KIND(Token_await, "await"), \ TOKEN_KIND(Token_asm, "asm"), \
TOKEN_KIND(Token_atomic, "atomic"), \ TOKEN_KIND(Token_yield, "yield"), \
TOKEN_KIND(Token_await, "await"), \
TOKEN_KIND(Token_atomic, "atomic"), \
TOKEN_KIND(Token__KeywordEnd, "_KeywordEnd"), \ TOKEN_KIND(Token__KeywordEnd, "_KeywordEnd"), \
TOKEN_KIND(Token_Count, "") TOKEN_KIND(Token_Count, "")