From c3c208b6a3c37687dce43dff8dd0a1bb336d571c Mon Sep 17 00:00:00 2001 From: lisyarus Date: Mon, 22 Dec 2025 23:49:08 +0300 Subject: [PATCH] Rename numeric_literal -> primitive_literal --- libs/ast/include/pslang/ast/literal.hpp | 24 ++++++++++++------------ libs/ast/source/expression.cpp | 2 +- libs/interpreter/source/eval.cpp | 2 +- libs/parser/rules/pslang.y | 24 ++++++++++++------------ 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/libs/ast/include/pslang/ast/literal.hpp b/libs/ast/include/pslang/ast/literal.hpp index 00ecbb8..aeae7d5 100644 --- a/libs/ast/include/pslang/ast/literal.hpp +++ b/libs/ast/include/pslang/ast/literal.hpp @@ -9,25 +9,25 @@ namespace pslang::ast { template - struct numeric_literal_base + struct primitive_literal_base { T value; ast::location location; }; - using bool_literal = numeric_literal_base; + using bool_literal = primitive_literal_base; - using i8_literal = numeric_literal_base; - using u8_literal = numeric_literal_base; - using i16_literal = numeric_literal_base; - using u16_literal = numeric_literal_base; - using i32_literal = numeric_literal_base; - using u32_literal = numeric_literal_base; - using i64_literal = numeric_literal_base; - using u64_literal = numeric_literal_base; + using i8_literal = primitive_literal_base; + using u8_literal = primitive_literal_base; + using i16_literal = primitive_literal_base; + using u16_literal = primitive_literal_base; + using i32_literal = primitive_literal_base; + using u32_literal = primitive_literal_base; + using i64_literal = primitive_literal_base; + using u64_literal = primitive_literal_base; - using f32_literal = numeric_literal_base; - using f64_literal = numeric_literal_base; + using f32_literal = primitive_literal_base; + using f64_literal = primitive_literal_base; using literal = std::variant< bool_literal, diff --git a/libs/ast/source/expression.cpp b/libs/ast/source/expression.cpp index 9418539..b9bb5e5 100644 --- a/libs/ast/source/expression.cpp +++ b/libs/ast/source/expression.cpp @@ -13,7 +13,7 @@ namespace pslang::ast using const_expression_visitor::apply; template - location apply(numeric_literal_base const & node) + location apply(primitive_literal_base const & node) { return node.location; } diff --git a/libs/interpreter/source/eval.cpp b/libs/interpreter/source/eval.cpp index 386e889..0640511 100644 --- a/libs/interpreter/source/eval.cpp +++ b/libs/interpreter/source/eval.cpp @@ -187,7 +187,7 @@ namespace pslang::interpreter value eval_impl(context & context, ast::expression_ptr const & expression); template - value eval_impl(context & context, ast::numeric_literal_base const & literal) + value eval_impl(context & context, ast::primitive_literal_base const & literal) { return primitive_value(primitive_value_base{literal.value}); } diff --git a/libs/parser/rules/pslang.y b/libs/parser/rules/pslang.y index 782b734..f1c7e79 100644 --- a/libs/parser/rules/pslang.y +++ b/libs/parser/rules/pslang.y @@ -44,13 +44,13 @@ struct context; YY_DECL; template -::pslang::ast::literal parse_numeric_literal(std::string const & str, ::pslang::ast::location const & location) +::pslang::ast::literal parse_primitive_literal(std::string const & str, ::pslang::ast::location const & location) { T value; auto result = std::from_chars(str.data(), str.data() + str.size(), value); if (result.ec != std::errc()) throw std::system_error(std::make_error_code(result.ec)); - return ::pslang::ast::numeric_literal_base{value, location}; + return ::pslang::ast::primitive_literal_base{value, location}; } } @@ -324,16 +324,16 @@ nonempty_comma_separated_expression_list literal : true { $$ = ast::literal(ast::bool_literal{true, ctx.location}); } | false { $$ = ast::literal(ast::bool_literal{false, ctx.location}); } -| lit_i8 { $$ = parse_numeric_literal($1, ctx.location); } -| lit_u8 { $$ = parse_numeric_literal($1, ctx.location); } -| lit_i16 { $$ = parse_numeric_literal($1, ctx.location); } -| lit_u16 { $$ = parse_numeric_literal($1, ctx.location); } -| lit_i32 { $$ = parse_numeric_literal($1, ctx.location); } -| lit_u32 { $$ = parse_numeric_literal($1, ctx.location); } -| lit_i64 { $$ = parse_numeric_literal($1, ctx.location); } -| lit_u64 { $$ = parse_numeric_literal($1, ctx.location); } -| lit_f32 { $$ = parse_numeric_literal($1, ctx.location); } -| lit_f64 { $$ = parse_numeric_literal($1, ctx.location); } +| lit_i8 { $$ = parse_primitive_literal($1, ctx.location); } +| lit_u8 { $$ = parse_primitive_literal($1, ctx.location); } +| lit_i16 { $$ = parse_primitive_literal($1, ctx.location); } +| lit_u16 { $$ = parse_primitive_literal($1, ctx.location); } +| lit_i32 { $$ = parse_primitive_literal($1, ctx.location); } +| lit_u32 { $$ = parse_primitive_literal($1, ctx.location); } +| lit_i64 { $$ = parse_primitive_literal($1, ctx.location); } +| lit_u64 { $$ = parse_primitive_literal($1, ctx.location); } +| lit_f32 { $$ = parse_primitive_literal($1, ctx.location); } +| lit_f64 { $$ = parse_primitive_literal($1, ctx.location); } | lit_char8 { $$ = ast::u8_literal{static_cast($1), ctx.location}; } ;