Merge 604b9b6 into e6c9bd4

polserver · Jun 1, 2023 · 889e4f1 · 889e4f1
2 parents e6c9bd4 + 604b9b6
commit 889e4f1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/pol-core/bscript/compiler/analyzer/Variables.cpp b/pol-core/bscript/compiler/analyzer/Variables.cpp
@@ -60,8 +60,8 @@ std::vector<std::shared_ptr<Variable>> Variables::remove_all_but( unsigned count
           report.warning( removing->source_location, "local variable '", last_name,
                           "' was not used." );
         }
-        variables_by_name.erase( itr );
         removed.push_back( removing );
+        variables_by_name.erase( itr );
       }
       names_by_index.pop_back();
     }

diff --git a/pol-core/bscript/compiler/file/SourceLocation.cpp b/pol-core/bscript/compiler/file/SourceLocation.cpp
@@ -76,6 +76,12 @@ SourceLocation::SourceLocation( const SourceFileIdentifier* source_file_identifi
 {
 }
 
+SourceLocation::SourceLocation( const SourceFileIdentifier* source_file_identifier,
+                                const Range& range )
+    : source_file_identifier( source_file_identifier ), range( range )
+{
+}
+
 SourceLocation::SourceLocation( const SourceFileIdentifier* source_file_identifier,
                                 antlr4::ParserRuleContext& ctx )
     : source_file_identifier( source_file_identifier ), range( ctx )

diff --git a/pol-core/bscript/compiler/file/SourceLocation.h b/pol-core/bscript/compiler/file/SourceLocation.h
@@ -44,6 +44,7 @@ class SourceLocation
 public:
   SourceLocation( const SourceFileIdentifier*, unsigned short line_number,
                   unsigned short character_column );
+  SourceLocation( const SourceFileIdentifier*, const Range& );
   SourceLocation( const SourceFileIdentifier*, antlr4::ParserRuleContext& );
   SourceLocation( const SourceFileIdentifier*, antlr4::tree::TerminalNode& );