ed/gencpp
1
0 Fork 0
mirror of https://github.com/Ed94/gencpp.git synced 2026-11-14 18:20:07 -08:00
Code Issues Packages Projects Releases Wiki Activity

progress

Browse Source
This commit is contained in:
ed committed 2026-10-04 13:15:04 -04:00
1 parent b754adcd96
commit 1a60fd54fc
11 files changed
+355 -125
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

base/components/interface.hpp
+17 -8
View File
@@ -15,6 +15,13 @@
\▓▓▓▓▓▓ \▓▓▓▓▓▓▓\▓▓ \▓▓ \▓▓▓▓▓▓\▓▓ \▓▓ \▓▓▓▓ \▓▓▓▓▓▓▓\▓▓ \▓▓ \▓▓▓▓▓▓▓ \▓▓▓▓▓▓▓ \▓▓▓▓▓▓▓
*/
struct ParseInfo
{
ParseMessage* messages;
LexedInfo lexed;
Code result;
};
// Note(Ed): This is subject to heavily change
// with upcoming changes to the library's fallback (default) allocations strategy;
// and major changes to lexer/parser context usage.
@@ -80,6 +87,7 @@ struct Context
// TODO(Ed): Active parse context vs a parse result need to be separated conceptually
ParseContext parser;
ParseInfo parse_info;
// TODO(Ed): Formatting - This will eventually be in a separate struct when in the process of serialization of the builder.
s32 temp_serialize_indent;
@@ -363,13 +371,6 @@ struct ParseStackNode
// TODO(Ed): When an error occurs, the parse stack is not released and instead the scope is left dangling.
};
struct ParseInfo
{
ParseMessage* messages;
LexedInfo lexed;
Code result;
};
struct ParseOpts
{
AllocatorInfo backing_msgs;
@@ -388,7 +389,15 @@ GEN_API CodeBody parse_export_body ( Str export_def );
GEN_API CodeExtern parse_extern_link ( Str exten_link_def );
GEN_API CodeFriend parse_friend ( Str friend_def );
GEN_API CodeFn parse_function ( Str fn_def );
GEN_API CodeBody parse_global_body ( Str body_def );
struct Opts_parse_global_body
{
Context* ctx;
ParseInfo* info;
};
GEN_API void parse_global_body_base( Context* ctx, Str body_def, ParseInfo* info );
GEN_API CodeBody parse_global_body( Str body_def, Opts_parse_global_body opts GEN_PARAM_DEFAULT );
GEN_API CodeNS parse_namespace ( Str namespace_def );
GEN_API CodeOperator parse_operator ( Str operator_def );
GEN_API CodeOpCast parse_operator_cast( Str operator_def );
base/components/interface.parsing.cpp
+62 -42
View File
@@ -55,7 +55,7 @@ CodeClass parse_class( Str def )
lexed = lex(ctx, def);
ctx->parser.tokens = lexed.tokens;
if (ctx->parser.tokens.ptr == nullptr) {
if (lexed.messages != nullptr || ctx->parser.tokens.num == 0) {
if (lexed.messages != nullptr && lexed.messages->content.Ptr != nullptr)
parser_record_failure(ctx, lexed.messages->content);
else
@@ -86,7 +86,7 @@ CodeConstructor parse_constructor(Str def )
lexed = lex(ctx, def);
ctx->parser.tokens = lexed.tokens;
if (ctx->parser.tokens.ptr == nullptr) {
if (lexed.messages != nullptr || ctx->parser.tokens.num == 0) {
if (lexed.messages != nullptr && lexed.messages->content.Ptr != nullptr)
parser_record_failure(ctx, lexed.messages->content);
else
@@ -163,7 +163,7 @@ CodeDefine parse_define( Str def )
lexed = lex(ctx, def);
ctx->parser.tokens = lexed.tokens;
if (ctx->parser.tokens.ptr == nullptr) {
if (lexed.messages != nullptr || ctx->parser.tokens.num == 0) {
if (lexed.messages != nullptr && lexed.messages->content.Ptr != nullptr)
parser_record_failure(ctx, lexed.messages->content);
else
@@ -194,7 +194,7 @@ CodeDestructor parse_destructor( Str def )
lexed = lex(ctx, def);
ctx->parser.tokens = lexed.tokens;
if (ctx->parser.tokens.ptr == nullptr) {
if (lexed.messages != nullptr || ctx->parser.tokens.num == 0) {
if (lexed.messages != nullptr && lexed.messages->content.Ptr != nullptr)
parser_record_failure(ctx, lexed.messages->content);
else
@@ -223,7 +223,7 @@ CodeEnum parse_enum( Str def )
lexed = lex(ctx, def);
ctx->parser.tokens = lexed.tokens;
if (ctx->parser.tokens.ptr == nullptr) {
if (lexed.messages != nullptr || ctx->parser.tokens.num == 0) {
if (lexed.messages != nullptr && lexed.messages->content.Ptr != nullptr)
parser_record_failure(ctx, lexed.messages->content);
else
@@ -249,7 +249,7 @@ CodeBody parse_export_body( Str def )
lexed = lex(ctx, def);
ctx->parser.tokens = lexed.tokens;
if (ctx->parser.tokens.ptr == nullptr) {
if (lexed.messages != nullptr || ctx->parser.tokens.num == 0) {
if (lexed.messages != nullptr && lexed.messages->content.Ptr != nullptr)
parser_record_failure(ctx, lexed.messages->content);
else
@@ -275,7 +275,7 @@ CodeExtern parse_extern_link( Str def )
lexed = lex(ctx, def);
ctx->parser.tokens = lexed.tokens;
if (ctx->parser.tokens.ptr == nullptr) {
if (lexed.messages != nullptr || ctx->parser.tokens.num == 0) {
if (lexed.messages != nullptr && lexed.messages->content.Ptr != nullptr)
parser_record_failure(ctx, lexed.messages->content);
else
@@ -301,7 +301,7 @@ CodeFriend parse_friend( Str def )
lexed = lex(ctx, def);
ctx->parser.tokens = lexed.tokens;
if (ctx->parser.tokens.ptr == nullptr) {
if (lexed.messages != nullptr || ctx->parser.tokens.num == 0) {
if (lexed.messages != nullptr && lexed.messages->content.Ptr != nullptr)
parser_record_failure(ctx, lexed.messages->content);
else
@@ -327,7 +327,7 @@ CodeFn parse_function( Str def )
lexed = lex(ctx, def);
ctx->parser.tokens = lexed.tokens;
if (ctx->parser.tokens.ptr == nullptr) {
if (lexed.messages != nullptr || ctx->parser.tokens.num == 0) {
if (lexed.messages != nullptr && lexed.messages->content.Ptr != nullptr)
parser_record_failure(ctx, lexed.messages->content);
else
@@ -340,35 +340,55 @@ done:
return result;
}
CodeBody parse_global_body( Str def )
void parse_global_body_base( Context* ctx, Str def, ParseInfo* info )
{
// TODO(Ed): Lift this.
Context* ctx = _ctx;
CodeBody result = InvalidCode;
LexedInfo lexed = struct_zero(LexedInfo);
LexedInfo lexed;
CodeBody body;
ctx->parser = struct_zero(ParseContext);
if (check_parse_args(def) == false)
goto done;
if ( ctx == nullptr || info == nullptr )
GEN_FATAL( "parse_global_body_base: null context or info" );
lexed = lex(ctx, def);
ctx->parser.tokens = lexed.tokens;
if (ctx->parser.tokens.ptr == nullptr) {
if (lexed.messages != nullptr && lexed.messages->content.Ptr != nullptr)
parser_record_failure(ctx, lexed.messages->content);
else
parser_record_failure(ctx, txt("parse: lex produced no tokens"));
goto done;
info[0] = struct_zero( ParseInfo );
lexed = struct_zero( LexedInfo );
body = (CodeBody) make_code();
body->Type = CT_Global_Body;
ctx->parser = struct_zero( ParseContext );
if ( check_parse_args( def ) == false ) {
info->result = cast( Code, body );
info->messages = ctx->parser.messages;
return;
}
{
ParseStackNode scope = NullScope;
parser_push(& ctx->parser, & scope);
result = parse_global_nspace(ctx, CT_Global_Body );
parser_pop(& ctx->parser);
lexed = lex( ctx, def );
info->lexed = lexed;
if ( lexed.tokens.num == 0 ) {
info->result = cast( Code, body );
info->messages = ctx->parser.messages;
return;
}
done:
return result;
ctx->parser.tokens = lexed.tokens; {
ParseStackNode scope = NullScope;
parser_push( & ctx->parser, & scope );
body = parse_global_nspace( ctx, CT_Global_Body );
parser_pop( & ctx->parser );
}
info->result = cast( Code, body );
info->messages = ctx->parser.messages;
}
CodeBody parse_global_body( Str def, Opts_parse_global_body opts ) {
Opts_parse_global_body resolved = get_optional( opts );
Context* ctx = resolved.ctx;
ParseInfo* info;
if ( ctx == nullptr ) ctx = _ctx;
if ( ctx == nullptr ) GEN_FATAL( "parse_global_body: no context" );
info = resolved.info; if ( info == nullptr ) info = & ctx->parse_info;
parse_global_body_base( ctx, def, info );
return cast( CodeBody, info->result );
}
CodeNS parse_namespace( Str def )
@@ -384,7 +404,7 @@ CodeNS parse_namespace( Str def )
lexed = lex(ctx, def);
ctx->parser.tokens = lexed.tokens;
if (ctx->parser.tokens.ptr == nullptr) {
if (lexed.messages != nullptr || ctx->parser.tokens.num == 0) {
if (lexed.messages != nullptr && lexed.messages->content.Ptr != nullptr)
parser_record_failure(ctx, lexed.messages->content);
else
@@ -410,7 +430,7 @@ CodeOperator parse_operator( Str def )
lexed = lex(ctx, def);
ctx->parser.tokens = lexed.tokens;
if (ctx->parser.tokens.ptr == nullptr) {
if (lexed.messages != nullptr || ctx->parser.tokens.num == 0) {
if (lexed.messages != nullptr && lexed.messages->content.Ptr != nullptr)
parser_record_failure(ctx, lexed.messages->content);
else
@@ -436,7 +456,7 @@ CodeOpCast parse_operator_cast( Str def )
lexed = lex(ctx, def);
ctx->parser.tokens = lexed.tokens;
if (ctx->parser.tokens.ptr == nullptr) {
if (lexed.messages != nullptr || ctx->parser.tokens.num == 0) {
if (lexed.messages != nullptr && lexed.messages->content.Ptr != nullptr)
parser_record_failure(ctx, lexed.messages->content);
else
@@ -462,7 +482,7 @@ CodeStruct parse_struct( Str def )
lexed = lex(ctx, def);
ctx->parser.tokens = lexed.tokens;
if (ctx->parser.tokens.ptr == nullptr) {
if (lexed.messages != nullptr || ctx->parser.tokens.num == 0) {
if (lexed.messages != nullptr && lexed.messages->content.Ptr != nullptr)
parser_record_failure(ctx, lexed.messages->content);
else
@@ -493,7 +513,7 @@ CodeTemplate parse_template( Str def )
lexed = lex(ctx, def);
ctx->parser.tokens = lexed.tokens;
if (ctx->parser.tokens.ptr == nullptr) {
if (lexed.messages != nullptr || ctx->parser.tokens.num == 0) {
if (lexed.messages != nullptr && lexed.messages->content.Ptr != nullptr)
parser_record_failure(ctx, lexed.messages->content);
else
@@ -519,7 +539,7 @@ CodeTypename parse_type( Str def )
lexed = lex(ctx, def);
ctx->parser.tokens = lexed.tokens;
if (ctx->parser.tokens.ptr == nullptr) {
if (lexed.messages != nullptr || ctx->parser.tokens.num == 0) {
if (lexed.messages != nullptr && lexed.messages->content.Ptr != nullptr)
parser_record_failure(ctx, lexed.messages->content);
else
@@ -545,7 +565,7 @@ CodeTypedef parse_typedef( Str def )
lexed = lex(ctx, def);
ctx->parser.tokens = lexed.tokens;
if (ctx->parser.tokens.ptr == nullptr) {
if (lexed.messages != nullptr || ctx->parser.tokens.num == 0) {
if (lexed.messages != nullptr && lexed.messages->content.Ptr != nullptr)
parser_record_failure(ctx, lexed.messages->content);
else
@@ -571,7 +591,7 @@ CodeUnion parse_union( Str def )
lexed = lex(ctx, def);
ctx->parser.tokens = lexed.tokens;
if (ctx->parser.tokens.ptr == nullptr) {
if (lexed.messages != nullptr || ctx->parser.tokens.num == 0) {
if (lexed.messages != nullptr && lexed.messages->content.Ptr != nullptr)
parser_record_failure(ctx, lexed.messages->content);
else
@@ -597,7 +617,7 @@ CodeUsing parse_using( Str def )
lexed = lex(ctx, def);
ctx->parser.tokens = lexed.tokens;
if (ctx->parser.tokens.ptr == nullptr) {
if (lexed.messages != nullptr || ctx->parser.tokens.num == 0) {
if (lexed.messages != nullptr && lexed.messages->content.Ptr != nullptr)
parser_record_failure(ctx, lexed.messages->content);
else
@@ -623,7 +643,7 @@ CodeVar parse_variable( Str def )
lexed = lex(ctx, def);
ctx->parser.tokens = lexed.tokens;
if (ctx->parser.tokens.ptr == nullptr) {
if (lexed.messages != nullptr || ctx->parser.tokens.num == 0) {
if (lexed.messages != nullptr && lexed.messages->content.Ptr != nullptr)
parser_record_failure(ctx, lexed.messages->content);
else
base/components/lexer.cpp
+4 -4
View File
@@ -694,7 +694,7 @@ LexedInfo lex(Context* lib_ctx, Str content)
case Lex_ReturnNull:
{
info.messages = c.messages;
return info;
goto Lex_Done;
}
}
}
@@ -725,7 +725,7 @@ LexedInfo lex(Context* lib_ctx, Str content)
lexer_record_failure_fmt(lib_ctx, ctx, "gen::lex: invalid varadic argument, expected '...' got '..%c' (%d, %d)\n%s", (* ctx->scanner), c.line, c.column, context_str );
info.messages = c.messages;
return info;
goto Lex_Done;
}
}
@@ -1282,7 +1282,7 @@ LexedInfo lex(Context* lib_ctx, Str content)
StrBuilder context_str = strbuilder_fmt_buf( lib_ctx->Allocator_Temp, "%.*s", min( 100, c.left ), c.scanner );
lexer_record_failure_fmt(lib_ctx, ctx, "Failed to lex token '%c' (%d, %d)\n%s", (* ctx->scanner), c.line, c.column, context_str );
info.messages = c.messages;
return info;
goto Lex_Done;
}
FoundToken:
@@ -1318,8 +1318,8 @@ LexedInfo lex(Context* lib_ctx, Str content)
info.messages = c.messages;
info.text = content;
info.tokens = struct_init(TokenSlice) { pcast(Token*, c.tokens), scast(s32, array_num(c.tokens)) };
Lex_Done:
info.tokens = struct_init(TokenSlice) { pcast(Token*, c.tokens), scast(s32, array_num(c.tokens)) };
return info;
}
base/components/parser.cpp
+2 -2
View File
@@ -1715,9 +1715,9 @@ CodeBody parse_global_nspace(Context* ctx, CodeType which)
{
case Tok_Comma:
{
log_failure("Dangling comma found: %SB\nContext:\n%SB", tok_to_strbuilder(ctx->Allocator_Temp, currtok), parser_to_strbuilder(& ctx->parser, ctx->Allocator_Temp));
parser_record_failure(ctx, txt("Dangling comma"));
parser_pop( & ctx->parser);
return InvalidCode;
return result;
}
break;
case Tok_Statement_End: