Added ASTERISK

Author: renecannao

examples/main_pgsql_example.cpp

@@ -10,8 +10,10 @@ int main() {
         "SELECT name FROM users;",
         "INSERT INTO products VALUES ('a new gadget');",
         "QUIT;",
-        "SELECT * FROM;", 
-        "INSERT INTO logs VALUES (no_quotes_here);" 
+        "SELECT * FROM tablenameA;",
+        "SELECT * FROM tablenameB",
+        "SELECT * FROM;",
+        "INSERT INTO logs VALUES (no_quotes_here);"
     };
 
     for (const auto& query : queries) {

include/pgsql_parser/pgsql_ast.h

@@ -1,3 +1,4 @@
+// include/pgsql_parser/pgsql_ast.h
 #ifndef PGSQL_PARSER_AST_H
 #define PGSQL_PARSER_AST_H
 
@@ -6,7 +7,7 @@
 #include <iostream>
 #include <algorithm> // For potential string manipulations
 
-namespace PgsqlParser { // Changed namespace
+namespace PgsqlParser {
 
 // Enum for different types of AST nodes
 enum class NodeType {
@@ -15,7 +16,8 @@ enum class NodeType {
     NODE_SELECT_STATEMENT,
     NODE_INSERT_STATEMENT,
     NODE_IDENTIFIER,
-    NODE_STRING_LITERAL
+    NODE_STRING_LITERAL,
+    NODE_ASTERISK // New node type for '*' in SELECT
 };
 
 // Basic AST Node
@@ -57,6 +59,7 @@ inline void print_ast(const AstNode* node, int indent = 0) {
         case NodeType::NODE_INSERT_STATEMENT: type_str = "INSERT_STMT"; break;
         case NodeType::NODE_IDENTIFIER: type_str = "IDENTIFIER"; break;
         case NodeType::NODE_STRING_LITERAL: type_str = "STRING_LITERAL"; break;
+        case NodeType::NODE_ASTERISK: type_str = "ASTERISK"; break; // Handle new type
         default: type_str = "UNHANDLED_TYPE(" + std::to_string(static_cast<int>(node->type)) + ")"; break;
     }
     std::cout << "Type: " << type_str << ", Value: '" << node->value << "'" << std::endl;

src/pgsql_parser/pgsql_lexer.l

@@ -46,6 +46,8 @@
                     return TOKEN_STRING_LITERAL; 
                   }
 
+"*"               { return TOKEN_ASTERISK; }
+
 "("               { return TOKEN_LPAREN; }
 ")"               { return TOKEN_RPAREN; }
 ";"               { return TOKEN_SEMICOLON; }

src/pgsql_parser/pgsql_parser.y

@@ -1,10 +1,12 @@
+/* src/pgsql_parser/pgsql_parser.y */
 %code requires {
     namespace PgsqlParser {
       struct AstNode;
     }
     #include <string> 
 }
 
+
 %{ // C PROLOGUE - This code is now part of a C++ compilation unit
 #include "pgsql_parser/pgsql_parser.h" // For PgsqlParser::Parser context & yyscan_t
 
@@ -36,15 +38,14 @@ int pgsql_yylex(union PGSQL_YYSTYPE* yylval_param, yyscan_t yyscanner, PgsqlPars
     PgsqlParser::AstNode* node_val;
 }
 
-/* Declare tokens from the lexer */
 %token TOKEN_SELECT TOKEN_FROM TOKEN_INSERT TOKEN_INTO TOKEN_VALUES
 %token TOKEN_LPAREN TOKEN_RPAREN TOKEN_SEMICOLON
+%token TOKEN_ASTERISK
 
 %token <str_val> TOKEN_QUIT
 %token <str_val> TOKEN_IDENTIFIER
 %token <str_val> TOKEN_STRING_LITERAL
 
-/* Declare non-terminals and the type of their semantic value */
 %type <node_val> statement
 %type <node_val> simple_statement
 %type <node_val> command_statement
@@ -53,9 +54,11 @@ int pgsql_yylex(union PGSQL_YYSTYPE* yylval_param, yyscan_t yyscanner, PgsqlPars
 %type <node_val> identifier_node
 %type <node_val> string_literal_node
 %type <node_val> value_for_insert
+%type <node_val> select_list_item
+%type <node_val> optional_semicolon /* <<< NEW TYPE (though it produces no value for AST) */
 
 
-%start query_list /* The start symbol of our grammar */
+%start query_list
 
 %%
 
@@ -64,6 +67,12 @@ query_list:
     | query_list statement { /* Manages last statement's AST. */ }
     ;
 
+/* NEW RULE for optional semicolon */
+optional_semicolon:
+    TOKEN_SEMICOLON { $$ = nullptr; /* Or some placeholder if needed, but usually not for this */ }
+    | /* empty */   { $$ = nullptr; } /* Allows nothing, produces no AST node for itself */
+    ;
+
 statement:
     simple_statement    { $$ = $1; if (parser_context) parser_context->internal_set_ast($1); }
     | select_statement  { $$ = $1; if (parser_context) parser_context->internal_set_ast($1); }
@@ -75,9 +84,10 @@ simple_statement:
     ;
 
 command_statement:
-    TOKEN_QUIT TOKEN_SEMICOLON {
+    TOKEN_QUIT optional_semicolon {
         $$ = new PgsqlParser::AstNode(PgsqlParser::NodeType::NODE_COMMAND, std::move(*$1));
         delete $1;
+        // $2 (optional_semicolon) doesn't contribute a meaningful value here
     }
     ;
 
@@ -99,11 +109,19 @@ string_literal_node:
     }
     ;
 
+select_list_item:
+    identifier_node { $$ = $1; } 
+    | TOKEN_ASTERISK { 
+        $$ = new PgsqlParser::AstNode(PgsqlParser::NodeType::NODE_ASTERISK, "*"); 
+    }
+    ;
+
 select_statement:
-    TOKEN_SELECT identifier_node TOKEN_FROM identifier_node TOKEN_SEMICOLON {
+    TOKEN_SELECT select_list_item TOKEN_FROM identifier_node optional_semicolon { /* MODIFIED */
         $$ = new PgsqlParser::AstNode(PgsqlParser::NodeType::NODE_SELECT_STATEMENT); 
         $$->addChild($2); 
         $$->addChild($4); 
+        // $5 (optional_semicolon) doesn't contribute
     }
     ;
 
@@ -112,14 +130,16 @@ value_for_insert:
     ;
 
 insert_statement:
-    TOKEN_INSERT TOKEN_INTO identifier_node TOKEN_VALUES TOKEN_LPAREN value_for_insert TOKEN_RPAREN TOKEN_SEMICOLON {
+    TOKEN_INSERT TOKEN_INTO identifier_node TOKEN_VALUES TOKEN_LPAREN value_for_insert TOKEN_RPAREN optional_semicolon {
         $$ = new PgsqlParser::AstNode(PgsqlParser::NodeType::NODE_INSERT_STATEMENT); 
         $$->addChild($3); 
         $$->addChild($6); 
+        // $8 (optional_semicolon) doesn't contribute
     }
     ;
 
 %%
 
 // pgsql_yyerror is defined in pgsql_parser.cpp with C linkage,
 // and declared in pgsql_parser.h. Bison will generate a call to it.
+