TODO(#330)

[nothing.git] / src / script / parser.h

diff --git a/src/script/parser.h b/src/script/parser.h
index 74deb610097af38bd32c0816316a27af250980ee..21247dae5757a019dac8a1f8e0c4a192557ef6fe 100644 (file)
--- a/src/script/parser.h
+++ b/src/script/parser.h
@@ -4,32 +4,28 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include "script/expr.h"
-
-struct ParseError
-{
-    const char *error_message;
-    size_t error_cursor;
-};
+#include "script/tokenizer.h"
 
 struct ParseResult
 {
     bool is_error;
+    const char *end;
     union {
         struct Expr expr;
-        struct ParseError error;
+        const char *error_message;
     };
 };
 
-struct ParseResult parse_success(struct Expr expr);
+struct ParseResult parse_success(struct Expr expr,
+                                 const char *end);
 struct ParseResult parse_failure(const char *error,
-                                 size_t error_cursor);
+                                 const char *end);
 
-struct ParseResult create_expr_from_str(const char *str,
-                                        size_t *cursor,
-                                        size_t n);
+struct ParseResult read_expr_from_string(Gc *gc, const char *str);
+struct ParseResult read_expr_from_file(Gc *gc, const char *filename);
 
 void print_parse_error(FILE *stream,
                        const char *str,
-                       struct ParseError result);
+                       struct ParseResult result);
 
 #endif  // PARSER_H_