[flang] Debugging new provenance support.

Original-commit: flang-compiler/f18@1233f666da21d88fb84968c1e46cddf45557d0a1
Reviewed-on: https://github.com/flang-compiler/f18/pull/9
Tree-same-pre-rewrite: false

diff --git a/flang/lib/parser/message.cc b/flang/lib/parser/message.cc
index 82a23dc..3b69ffc 100644 (file)
--- a/flang/lib/parser/message.cc
+++ b/flang/lib/parser/message.cc
@@ -8,7 +8,7 @@ void Message::Emit(std::ostream &o, const AllSources &sources) const {
     context_->Emit(o, sources);
   }
   sources.Identify(o, provenance_, "");
-  o << ": " << message_ << '\n';
+  o << "   " << message_ << '\n';
 }
 
 void Messages::Emit(std::ostream &o, const AllSources &sources) const {

diff --git a/flang/lib/parser/preprocessor.cc b/flang/lib/parser/preprocessor.cc
index 6c9c0be..ead2365 100644 (file)
--- a/flang/lib/parser/preprocessor.cc
+++ b/flang/lib/parser/preprocessor.cc
@@ -28,6 +28,7 @@ void TokenSequence::clear() {
   start_.clear();
   nextStart_ = 0;
   char_.clear();
+  provenances_.clear();
 }
 
 void TokenSequence::pop_back() {

diff --git a/flang/lib/parser/preprocessor.h b/flang/lib/parser/preprocessor.h
index 7aaed5c..1d7211d 100644 (file)
--- a/flang/lib/parser/preprocessor.h
+++ b/flang/lib/parser/preprocessor.h
@@ -89,7 +89,8 @@ public:
   }
   TokenSequence(TokenSequence &&that)
     : start_{std::move(that.start_)},
-      nextStart_{that.nextStart_}, char_{std::move(that.char_)} {}
+      nextStart_{that.nextStart_}, char_{std::move(that.char_)},
+      provenances_{std::move(that.provenances_)} {}
   TokenSequence(const std::string &s) { Put(s, 0); }  // TODO predefined prov.
 
   TokenSequence &operator=(const TokenSequence &that) {
@@ -121,7 +122,6 @@ public:
   }
 
   void CloseToken() {
-    // CHECK(char_.size() > nextStart_);
     start_.emplace_back(nextStart_);
     nextStart_ = char_.size();
   }

diff --git a/flang/lib/parser/provenance.cc b/flang/lib/parser/provenance.cc
index a06899c..24bff96 100644 (file)
--- a/flang/lib/parser/provenance.cc
+++ b/flang/lib/parser/provenance.cc
@@ -4,6 +4,11 @@
 namespace Fortran {
 namespace parser {
 
+void OffsetToProvenanceMappings::clear() {
+  bytes_ = 0;
+  provenanceMap_.clear();
+}
+
 void OffsetToProvenanceMappings::Put(ProvenanceRange range) {
   if (provenanceMap_.empty()) {
     provenanceMap_.push_back({bytes_, range});
@@ -96,7 +101,7 @@ void AllSources::Identify(
                  std::pair<int, int> pos{
                      inc.source.FindOffsetLineAndColumn(at - origin.start)};
                  o << prefix << "at line " << pos.first << ", column "
-                   << pos.second << "in the file " << inc.source.path() << '\n';
+                   << pos.second << " in the file " << inc.source.path() << '\n';
                  if (origin.replaces.bytes > 0) {
                    o << prefix << " that was included\n";
                    Identify(o, origin.replaces.start, indented);
@@ -192,6 +197,8 @@ ProvenanceRange CookedSource::GetProvenance(const char *at) const {
 }
 
 void CookedSource::Marshal() {
+  CHECK(provenanceMap_.size() == buffer_.size());
+  provenanceMap_.Put(sources_.AddCompilerInsertion("EOF"));
   data_.resize(buffer_.size());
   char *p{&data_[0]};
   for (char ch : buffer_) {

diff --git a/flang/lib/parser/provenance.h b/flang/lib/parser/provenance.h
index a057b14..b07b551 100644 (file)
--- a/flang/lib/parser/provenance.h
+++ b/flang/lib/parser/provenance.h
@@ -40,6 +40,7 @@ class OffsetToProvenanceMappings {
 public:
   OffsetToProvenanceMappings() {}
   size_t size() const { return bytes_; }
+  void clear();
   void shrink_to_fit() { provenanceMap_.shrink_to_fit(); }
   void Put(ProvenanceRange);
   void Put(const OffsetToProvenanceMappings &);

diff --git a/flang/tools/f18/f18.cc b/flang/tools/f18/f18.cc
index a35459e..c549abc 100644 (file)
--- a/flang/tools/f18/f18.cc
+++ b/flang/tools/f18/f18.cc
@@ -153,7 +153,10 @@ int main(int argc, char *const argv[]) {
     std::cout << "demo PASS\n" << *result << '\n';
   } else {
     std::cerr << "demo FAIL\n";
-    allSources.Identify(std::cerr, state.GetProvenance(), "   ");
+    if (!state.IsAtEnd()) {
+      std::cerr << "final position: ";
+      allSources.Identify(std::cerr, state.GetProvenance(), "   ");
+    }
     state.messages()->Emit(std::cerr, allSources);
     return EXIT_FAILURE;
   }