New preprocessor, work in progress

build/GenerateDef.zig

@@ -50,8 +50,8 @@ pub fn create(owner: *std.Build, options: Options) std.Build.Module.Import {
     };
 }
 
-fn make(step: *Step, prog_node: std.Progress.Node) !void {
-    _ = prog_node;
+fn make(step: *Step, options: std.Build.Step.MakeOptions) !void {
+    _ = options;
     const b = step.owner;
     const self: *GenerateDef = @fieldParentPtr("step", step);
     const arena = b.allocator;

src/aro.zig

@@ -35,5 +35,6 @@ test {
     _ = @import("aro/target.zig");
     _ = @import("aro/Tokenizer.zig");
     _ = @import("aro/toolchains/Linux.zig");
+    _ = @import("aro/Treap.zig");
     _ = @import("aro/Value.zig");
 }

src/aro/Diagnostics/messages.def

@@ -2509,3 +2509,13 @@ auto_type_self_initialized
     .msg = "variable '{s}' declared with deduced type '__auto_type' cannot appear in its own initializer"
     .extra = .str
     .kind = .@"error"
+
+expected_left_angle_bracket
+    .msg = "expected '<' but got '{s}'"
+    .extra = .str
+    .kind = .@"error"
+
+closing_paren_after
+    .msg = "expected '(' after '{s}'"
+    .extra = .str
+    .kind = .@"error"

src/aro/Parser.zig

@@ -7097,6 +7097,10 @@ fn unExpr(p: *Parser) Error!Result {
             return operand;
         },
         .plus_plus => {
+            if (p.in_macro) {
+                try p.err(.invalid_preproc_operator);
+                return error.ParsingFailed;
+            }
             p.tok_i += 1;
 
             var operand = try p.castExpr();
@@ -7123,6 +7127,10 @@ fn unExpr(p: *Parser) Error!Result {
             return operand;
         },
         .minus_minus => {
+            if (p.in_macro) {
+                try p.err(.invalid_preproc_operator);
+                return error.ParsingFailed;
+            }
             p.tok_i += 1;
 
             var operand = try p.castExpr();
@@ -7423,6 +7431,10 @@ fn suffixExpr(p: *Parser, lhs: Result) Error!Result {
     switch (p.tok_ids[p.tok_i]) {
         .l_paren => return p.callExpr(lhs),
         .plus_plus => {
+            if (p.in_macro) {
+                try p.err(.invalid_preproc_operator);
+                return error.ParsingFailed;
+            }
             defer p.tok_i += 1;
 
             var operand = lhs;
@@ -7441,6 +7453,10 @@ fn suffixExpr(p: *Parser, lhs: Result) Error!Result {
             return operand;
         },
         .minus_minus => {
+            if (p.in_macro) {
+                try p.err(.invalid_preproc_operator);
+                return error.ParsingFailed;
+            }
             defer p.tok_i += 1;
 
             var operand = lhs;
@@ -7459,6 +7475,10 @@ fn suffixExpr(p: *Parser, lhs: Result) Error!Result {
             return operand;
         },
         .l_bracket => {
+            if (p.in_macro) {
+                try p.err(.invalid_preproc_operator);
+                return error.ParsingFailed;
+            }
             const l_bracket = p.tok_i;
             p.tok_i += 1;
             var index = try p.expr();
@@ -7495,11 +7515,19 @@ fn suffixExpr(p: *Parser, lhs: Result) Error!Result {
             return ptr;
         },
         .period => {
+            if (p.in_macro) {
+                try p.err(.invalid_preproc_operator);
+                return error.ParsingFailed;
+            }
             p.tok_i += 1;
             const name = try p.expectIdentifier();
             return p.fieldAccess(lhs, name, false);
         },
         .arrow => {
+            if (p.in_macro) {
+                try p.err(.invalid_preproc_operator);
+                return error.ParsingFailed;
+            }
             p.tok_i += 1;
             const name = try p.expectIdentifier();
             if (lhs.ty.isArray()) {
@@ -8039,6 +8067,11 @@ fn makePredefinedIdentifier(p: *Parser, strings_top: usize) !Result {
 }
 
 fn stringLiteral(p: *Parser) Error!Result {
+    if (p.in_macro) {
+        try p.err(.invalid_preproc_expr_start);
+        return error.ParsingFailed;
+    }
+
     var string_end = p.tok_i;
     var string_kind: text_literal.Kind = .char;
     while (text_literal.Kind.classify(p.tok_ids[string_end], .string_literal)) |next| : (string_end += 1) {

src/aro/Pragma.zig

@@ -57,8 +57,8 @@ pub fn pasteTokens(pp: *Preprocessor, start_idx: TokenIndex) ![]const u8 {
             .r_paren => rparen_count += 1,
             .string_literal => {
                 if (rparen_count != 0) return error.ExpectedStringLiteral;
-                const str = pp.expandedSlice(tok);
-                try pp.char_buf.appendSlice(str[1 .. str.len - 1]);
+                const str = pp.tokSlice(tok);
+                try pp.char_buf.appendSlice(pp.gpa, str[1 .. str.len - 1]);
             },
             else => return error.ExpectedStringLiteral,
         }