feat(furas): introduce global variables
This commit is contained in:
@@ -1,22 +1,24 @@
|
|||||||
func println $u32 = native println
|
func println $u32 = native println
|
||||||
|
|
||||||
|
allocate uwu
|
||||||
|
|
||||||
public func main = #main
|
public func main = #main
|
||||||
main:
|
main:
|
||||||
push $u32 0
|
push $u32 0
|
||||||
store %0
|
storeg %uwu
|
||||||
loop_header:
|
loop_header:
|
||||||
load %0
|
loadg %uwu
|
||||||
push $u32 10
|
push $u32 10
|
||||||
ge
|
ge
|
||||||
jnz #loop_end
|
jnz #loop_end
|
||||||
loop_body:
|
loop_body:
|
||||||
load %0
|
loadg %uwu
|
||||||
call $u32 println
|
call $u32 println
|
||||||
|
|
||||||
load %0
|
loadg %uwu
|
||||||
push $u32 1
|
push $u32 1
|
||||||
add
|
add
|
||||||
store %0
|
storeg %uwu
|
||||||
|
|
||||||
jmp #loop_header
|
jmp #loop_header
|
||||||
loop_end:
|
loop_end:
|
||||||
|
|||||||
@@ -23,12 +23,13 @@ struct token {
|
|||||||
Colon, /**< `:` */
|
Colon, /**< `:` */
|
||||||
|
|
||||||
// Keywords
|
// Keywords
|
||||||
Func, /**< `func` keyword for defining functions. */
|
Func, /**< `func` keyword for defining functions. */
|
||||||
Type, /**< `type` keyword for defining types. */
|
Type, /**< `type` keyword for defining types. */
|
||||||
Native, /**< `native` keyword for native functions. :v: */
|
Native, /**< `native` keyword for native functions. :v: */
|
||||||
Import, /**< `import` keyword for importing functions and types. */
|
Import, /**< `import` keyword for importing functions and types. */
|
||||||
Public, /**< `public` access specifier. */
|
Public, /**< `public` access specifier. */
|
||||||
Private, /**< `private` access specifier. */
|
Private, /**< `private` access specifier. */
|
||||||
|
Allocate, /**< `allocate` keyword for global variables. */
|
||||||
|
|
||||||
// Instructions
|
// Instructions
|
||||||
Push,
|
Push,
|
||||||
@@ -56,6 +57,8 @@ struct token {
|
|||||||
Lenof,
|
Lenof,
|
||||||
Load,
|
Load,
|
||||||
Store,
|
Store,
|
||||||
|
LoadGlobal,
|
||||||
|
StoreGlobal,
|
||||||
Call,
|
Call,
|
||||||
Jmp,
|
Jmp,
|
||||||
Jnz,
|
Jnz,
|
||||||
|
|||||||
@@ -47,6 +47,8 @@ std::unordered_map<enum token::type, furvm::instruction_t> instructions = {
|
|||||||
{ token::Lenof, furvm::instruction_t::Lengthof },
|
{ token::Lenof, furvm::instruction_t::Lengthof },
|
||||||
{ token::Load, furvm::instruction_t::Load },
|
{ token::Load, furvm::instruction_t::Load },
|
||||||
{ token::Store, furvm::instruction_t::Store },
|
{ token::Store, furvm::instruction_t::Store },
|
||||||
|
{ token::LoadGlobal, furvm::instruction_t::LoadGlobal },
|
||||||
|
{ token::StoreGlobal, furvm::instruction_t::StoreGlobal },
|
||||||
{ token::Call, furvm::instruction_t::Call },
|
{ token::Call, furvm::instruction_t::Call },
|
||||||
{ token::Jmp, furvm::instruction_t::Jump },
|
{ token::Jmp, furvm::instruction_t::Jump },
|
||||||
{ token::Jnz, furvm::instruction_t::JumpNotZero },
|
{ token::Jnz, furvm::instruction_t::JumpNotZero },
|
||||||
@@ -72,6 +74,7 @@ const char* token_type(enum token::type type) {
|
|||||||
case token::Import: return "import";
|
case token::Import: return "import";
|
||||||
case token::Public: return "public";
|
case token::Public: return "public";
|
||||||
case token::Private: return "private";
|
case token::Private: return "private";
|
||||||
|
case token::Allocate: return "allocate";
|
||||||
case token::Push: return "push";
|
case token::Push: return "push";
|
||||||
case token::Array: return "array";
|
case token::Array: return "array";
|
||||||
case token::Get: return "get";
|
case token::Get: return "get";
|
||||||
@@ -97,6 +100,8 @@ const char* token_type(enum token::type type) {
|
|||||||
case token::Lenof: return "lenof";
|
case token::Lenof: return "lenof";
|
||||||
case token::Load: return "load";
|
case token::Load: return "load";
|
||||||
case token::Store: return "store";
|
case token::Store: return "store";
|
||||||
|
case token::LoadGlobal: return "loadg";
|
||||||
|
case token::StoreGlobal: return "storeg";
|
||||||
case token::Call: return "call";
|
case token::Call: return "call";
|
||||||
case token::Jmp: return "jmp";
|
case token::Jmp: return "jmp";
|
||||||
case token::Jnz: return "jnz";
|
case token::Jnz: return "jnz";
|
||||||
@@ -128,6 +133,7 @@ struct mod_context {
|
|||||||
pair_hash<std::string, furvm::function_sig, std::hash<std::string>, furvm::detail::function_sig_hash>>
|
pair_hash<std::string, furvm::function_sig, std::hash<std::string>, furvm::detail::function_sig_hash>>
|
||||||
functions;
|
functions;
|
||||||
std::unordered_map<std::string, furvm::mod_type_h> types;
|
std::unordered_map<std::string, furvm::mod_type_h> types;
|
||||||
|
std::unordered_map<std::string, std::uint16_t> variables;
|
||||||
|
|
||||||
std::unordered_map<std::string, label_context> labels;
|
std::unordered_map<std::string, label_context> labels;
|
||||||
|
|
||||||
@@ -214,6 +220,15 @@ struct mod_context {
|
|||||||
return { generator_error::Success };
|
return { generator_error::Success };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case token::Allocate: {
|
||||||
|
result = eat_token(lexer, token::Identifier);
|
||||||
|
if (!result) return result.error;
|
||||||
|
std::string name = std::string(result->value.string);
|
||||||
|
variables.emplace(name, variables.size());
|
||||||
|
mod.set_global_variable_count(variables.size());
|
||||||
|
return { generator_error::Success };
|
||||||
|
}
|
||||||
|
|
||||||
case token::Func:
|
case token::Func:
|
||||||
case token::Type:
|
case token::Type:
|
||||||
case token::Public:
|
case token::Public:
|
||||||
@@ -465,6 +480,16 @@ struct mod_context {
|
|||||||
if (!result) return result.error;
|
if (!result) return result.error;
|
||||||
instr.arg.u16 = result->value.uint;
|
instr.arg.u16 = result->value.uint;
|
||||||
} break;
|
} break;
|
||||||
|
case furvm::instruction_argument::GlobalVariable: {
|
||||||
|
result = eat_token(lexer, token::Percent);
|
||||||
|
if (!result) return result.error;
|
||||||
|
result = eat_token(lexer, token::Identifier);
|
||||||
|
if (!result) return result.error;
|
||||||
|
if (auto it = variables.find(std::string(result->value.string)); it != variables.end())
|
||||||
|
instr.arg.u16 = it->second;
|
||||||
|
else
|
||||||
|
throw std::runtime_error("Unknown global variable");
|
||||||
|
} break;
|
||||||
case furvm::instruction_argument::Function: {
|
case furvm::instruction_argument::Function: {
|
||||||
furvm::function_sig signature;
|
furvm::function_sig signature;
|
||||||
while ((result = next_token(lexer)).error.type == generator_error::Success &&
|
while ((result = next_token(lexer)).error.type == generator_error::Success &&
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ token_r lexer::next_token() {
|
|||||||
{ "import", token::Import },
|
{ "import", token::Import },
|
||||||
{ "public", token::Public },
|
{ "public", token::Public },
|
||||||
{ "private", token::Private },
|
{ "private", token::Private },
|
||||||
|
{ "allocate", token::Allocate },
|
||||||
|
|
||||||
{ "push", token::Push },
|
{ "push", token::Push },
|
||||||
{ "array", token::Array },
|
{ "array", token::Array },
|
||||||
@@ -65,6 +66,8 @@ token_r lexer::next_token() {
|
|||||||
{ "lenof", token::Lenof },
|
{ "lenof", token::Lenof },
|
||||||
{ "load", token::Load },
|
{ "load", token::Load },
|
||||||
{ "store", token::Store },
|
{ "store", token::Store },
|
||||||
|
{ "loadg", token::LoadGlobal },
|
||||||
|
{ "storeg", token::StoreGlobal },
|
||||||
{ "call", token::Call },
|
{ "call", token::Call },
|
||||||
{ "jmp", token::Jmp },
|
{ "jmp", token::Jmp },
|
||||||
{ "jnz", token::Jnz },
|
{ "jnz", token::Jnz },
|
||||||
|
|||||||
Reference in New Issue
Block a user