Linux compilation fixes
This commit is contained in:
parent
88b215e5cd
commit
2c11ee39de
5 changed files with 15 additions and 11 deletions
|
|
@ -12,7 +12,7 @@ namespace pslang::ast
|
|||
{
|
||||
expression_ptr expression;
|
||||
type_ptr type;
|
||||
location location;
|
||||
ast::location location;
|
||||
types::type_ptr inferred_source_type = nullptr;
|
||||
types::type_ptr inferred_type = nullptr;
|
||||
};
|
||||
|
|
@ -21,7 +21,7 @@ namespace pslang::ast
|
|||
{
|
||||
expression_ptr expression;
|
||||
type_ptr type;
|
||||
location location;
|
||||
ast::location location;
|
||||
types::type_ptr inferred_source_type = nullptr;
|
||||
types::type_ptr inferred_type = nullptr;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@ namespace pslang::ast
|
|||
{
|
||||
expression_ptr condition;
|
||||
statement_list_ptr statements;
|
||||
location prelude_location;
|
||||
location location;
|
||||
ast::location prelude_location;
|
||||
ast::location location;
|
||||
};
|
||||
|
||||
std::vector<block> blocks;
|
||||
|
|
@ -55,18 +55,18 @@ namespace pslang::ast
|
|||
{
|
||||
expression_ptr condition;
|
||||
statement_list_ptr statements;
|
||||
location prelude_location;
|
||||
location location;
|
||||
ast::location prelude_location;
|
||||
ast::location location;
|
||||
};
|
||||
|
||||
struct break_statement
|
||||
{
|
||||
location location;
|
||||
ast::location location;
|
||||
};
|
||||
|
||||
struct continue_statement
|
||||
{
|
||||
location location;
|
||||
ast::location location;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ namespace pslang::interpreter
|
|||
struct context
|
||||
{
|
||||
bool trace = false;
|
||||
foreign_resolver foreign_resolver;
|
||||
interpreter::foreign_resolver foreign_resolver;
|
||||
std::vector<frame> frame_stack;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ namespace pslang::ir
|
|||
|
||||
struct node
|
||||
{
|
||||
instruction instruction;
|
||||
ir::instruction instruction;
|
||||
|
||||
// Null for non-value instructions
|
||||
types::type_ptr inferred_type = nullptr;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
#pragma once
|
||||
|
||||
// 'linux' macro is not standard-conforming, but can still be present
|
||||
// with -std=gnu++XX or absence of -pedantic. Just undefine it in any case.
|
||||
#undef linux
|
||||
|
||||
namespace pslang::jit
|
||||
{
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue