fix(preprocessor): header location error

xensik · Feb 9, 2025 · 86c4def · 86c4def
1 parent e90444f
commit 86c4def
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/gen/arc/parser.ypp b/gen/arc/parser.ypp
@@ -320,7 +320,7 @@ program
     ;
 
 inline
-    : INLINE expr_path SEMICOLON { ppr.push_header($2->value); }
+    : INLINE expr_path SEMICOLON { ppr.push_header(@$, $2->value); }
     ;
 
 include

diff --git a/gen/gsc/parser.ypp b/gen/gsc/parser.ypp
@@ -299,7 +299,7 @@ program
     ;
 
 inline
-    : INLINE expr_path SEMICOLON { ppr.push_header($2->value); }
+    : INLINE expr_path SEMICOLON { ppr.push_header(@$, $2->value); }
     ;
 
 include

diff --git a/include/xsk/arc/preprocessor.hpp b/include/xsk/arc/preprocessor.hpp
@@ -32,7 +32,7 @@ struct preprocessor
 public:
     preprocessor(context* ctx, std::string const& name, u8 const* data, usize size);
     auto process() -> token;
-    auto push_header(std::string const& file) -> void;
+    auto push_header(location const& loc, std::string const& file) -> void;
     auto pop_header() -> void;
     auto ban_header(location const& loc) -> void;
 

diff --git a/include/xsk/gsc/preprocessor.hpp b/include/xsk/gsc/preprocessor.hpp
@@ -32,7 +32,7 @@ struct preprocessor
 public:
     preprocessor(context* ctx, std::string const& name, u8 const* data, usize size);
     auto process() -> token;
-    auto push_header(std::string const& file) -> void;
+    auto push_header(location const& loc, std::string const& file) -> void;
     auto pop_header() -> void;
     auto ban_header(location const& loc) -> void;
 

diff --git a/src/arc/parser.cpp b/src/arc/parser.cpp
@@ -2385,7 +2385,7 @@ namespace xsk { namespace arc {
 
   case 12: // inline: "#inline" expr_path ";"
 #line 323 "parser.ypp"
-                                 { ppr.push_header(yystack_[1].value.as < expr_path::ptr > ()->value); }
+                                 { ppr.push_header(yylhs.location, yystack_[1].value.as < expr_path::ptr > ()->value); }
 #line 2396 "parser.cpp"
     break;
 

diff --git a/src/arc/preprocessor.cpp b/src/arc/preprocessor.cpp
@@ -94,7 +94,7 @@ auto preprocessor::process() -> token
     }
 }
 
-auto preprocessor::push_header(std::string const& file) -> void
+auto preprocessor::push_header(location const& loc, std::string const& file) -> void
 {
     try
     {
@@ -103,7 +103,7 @@ auto preprocessor::push_header(std::string const& file) -> void
         for (auto& inc : includes_)
         {
             if (inc == name)
-                throw ppr_error(location{}, std::format("recursive header inclusion {} at {}", name, includes_.back()));
+                throw ppr_error(loc, std::format("recursive header inclusion {} at {}", name, includes_.back()));
         }
 
         auto data = ctx_->load_header(name);

diff --git a/src/gsc/parser.cpp b/src/gsc/parser.cpp
@@ -2189,7 +2189,7 @@ namespace xsk { namespace gsc {
 
   case 12: // inline: "#inline" expr_path ";"
 #line 302 "parser.ypp"
-                                 { ppr.push_header(yystack_[1].value.as < expr_path::ptr > ()->value); }
+                                 { ppr.push_header(yylhs.location, yystack_[1].value.as < expr_path::ptr > ()->value); }
 #line 2201 "parser.cpp"
     break;
 

diff --git a/src/gsc/preprocessor.cpp b/src/gsc/preprocessor.cpp
@@ -94,7 +94,7 @@ auto preprocessor::process() -> token
     }
 }
 
-auto preprocessor::push_header(std::string const& file) -> void
+auto preprocessor::push_header(location const& loc, std::string const& file) -> void
 {
     try
     {
@@ -103,7 +103,7 @@ auto preprocessor::push_header(std::string const& file) -> void
         for (auto& inc : includes_)
         {
             if (inc == name)
-                throw ppr_error(location{}, std::format("recursive header inclusion {} at {}", name, includes_.back()));
+                throw ppr_error(loc, std::format("recursive header inclusion {} at {}", name, includes_.back()));
         }
 
         auto data = ctx_->load_header(name);
-Original file line number
+Diff line change
@@ Expand Up / @@ -320,7 +320,7 @@ program @@
         ;
     inline
-        : INLINE expr_path SEMICOLON { ppr.push_header($2->value); }
+        : INLINE expr_path SEMICOLON { ppr.push_header(@$, $2->value); }
         ;
     include
@@ Expand Down @@