Outside

.github/workflows/c-cpp.yml

@@ -43,6 +43,8 @@ jobs:
 
     - name: test-mod
       run: make test-mod TRUTH_DIR=$GITHUB_WORKSPACE/../gapc-test-suite/Truth TRUTH_SUFFIX=_ubuntu
+    - name: test-mod_outside
+      run: make -j 2 test-mod_outside TRUTH_DIR=$GITHUB_WORKSPACE/../gapc-test-suite/Truth TRUTH_SUFFIX=_ubuntu
     - name: test-regress
       run: make test-regress TRUTH_DIR=$GITHUB_WORKSPACE/../gapc-test-suite/Truth
     - name: test-ambiguity
@@ -93,6 +95,8 @@ jobs:
 
     - name: test-mod
       run: make test-mod TRUTH_DIR=$GITHUB_WORKSPACE/../gapc-test-suite/Truth TRUTH_SUFFIX=_osx
+    - name: test-mod_outside
+      run: make -j 2 test-mod_outside TRUTH_DIR=$GITHUB_WORKSPACE/../gapc-test-suite/Truth TRUTH_SUFFIX=_osx
     - name: test-regress
       run: make test-regress TRUTH_DIR=$GITHUB_WORKSPACE/../gapc-test-suite/Truth
     - name: test-ambiguity

Makefile

@@ -41,8 +41,10 @@ CXXFILES = $(wildcard src/*.cc) \
 	   $(wildcard src/util/*.cc) \
 	   $(wildcard src/printer/*.cc) \
 	   $(wildcard src/specialize_grammar/*.cc) \
+	   $(wildcard src/outside/*.cc) \
 	   $(UNITTEST_CXX) \
            $(MODTESTS_CXX) \
+           $(MODOUTSIDETESTS_CXX) \
 	   $(wildcard testdata/test/*.cc) \
 	   rtlib/string.cc \
 
@@ -97,6 +99,7 @@ TEMP = $(GEN_CXXFILES) $(OFILES) $(DEPS)\
        src/position.hh \
        gapc \
        $(MODTESTS) \
+       $(MODOUTSIDETESTS) \
        stats testdata/modtest/stats.o \
        src/version.txt src/version.cc src/version.d src/version.o \
        testdata/config-tests/config.finished \
@@ -128,7 +131,7 @@ gapc: src/gapc.o $(MAIN_OBJ) src/version.o src/prefix.o
 
 stats \
 test_rt_tab \
-multi_cyk multi_deps multi_indices multi_list_size multi_eliminate_lists_more multi_eliminate_lists multi_algebra multi_signature multi_rt_approx multi_rt_all multi_in_out multi_self_rec multi_calls multi_table_dim multi_max_filter multi_loops multi_ys parser: src/version.o src/prefix.o
+multi_cyk multi_deps multi_indices multi_list_size multi_eliminate_lists_more multi_eliminate_lists multi_algebra multi_signature multi_rt_approx multi_rt_all multi_in_out multi_self_rec multi_calls multi_table_dim multi_max_filter multi_loops multi_ys parser outside_checksemantics outside_resolve_blocks outside_grammar outside_indices outside_loops: src/version.o src/prefix.o
 
 backtrack: src/version.o
 
@@ -283,11 +286,13 @@ testdata/unittest/%: testdata/unittest/%.o
 
 # modtest
 
-MODTESTS_CXX:= $(wildcard testdata/modtest/*.cc)
+MODTESTS_CXX:= $(wildcard testdata/modtest/multi*.cc)
+MODOUTSIDETESTS_CXX:= $(wildcard testdata/modtest/outside*.cc)
 
 MODTESTS:=$(sort $(subst testdata/modtest/,,$(MODTESTS_CXX:.cc=)))
+MODOUTSIDETESTS:=$(sort $(subst testdata/modtest/,,$(MODOUTSIDETESTS_CXX:.cc=)))
 modtests: $(MODTESTS)
-
+outsidetests: $(MODOUTSIDETESTS)
 
 # paraltest
 
@@ -307,6 +312,10 @@ test-mod: modtests
 	cd testdata/modtest &&\
 	$(SHELL) run.sh $(TRUTH_DIR)/Mod$(TRUTH_SUFFIX) $(MODTESTS)
 
+test-mod_outside: outsidetests
+	cd testdata/modtest &&\
+	$(SHELL) run_outside.sh $(TRUTH_DIR)/Mod$(TRUTH_SUFFIX) $(MODOUTSIDETESTS)
+
 gen-mod: modtests
 	cd testdata/modtest &&\
 	  $(SHELL) gen.sh $(TRUTH_DIR)/Mod$(TRUTH_SUFFIX) $(MODTESTS)

debian/copyright

@@ -8,7 +8,7 @@ It was downloaded from:
 
 Upstream Author(s):
 
-	Stefan Janssen <[email protected]>
+	Stefan Janssen <[email protected]>
     Georg Sauthoff <[email protected]>
 
 Copyright:

rtlib/filter.hh

@@ -127,5 +127,19 @@ inline bool samesize(const Basic_Sequence<a1, pos_type> &s1,
   return j1-i1 == j2-i2;
 }
 
+/* The recursion basis for outside candidates is the empty parse via the inside
+ * part of the user provided grammar (won't work if user grammar cannot parse
+ * the empty word!). However, an empty word could in principle be parsed between
+ * every two characters of the input. To enforce that this only happens after
+ * the complete track (= input sequence) has been consumed via outside parts,
+ * we apply this filter at the transition between outside and inside grammar
+ * parts, i.e. only at location (n,n).
+ */
+template<typename alphabet, typename pos_type, typename T>
+inline bool complete_track(
+    const Basic_Sequence<alphabet, pos_type> &seq, T i, T j) {
+  return ((i == seq.n) && (j == seq.n));
+}
+
 
 #endif  // RTLIB_FILTER_HH_

rtlib/generic_main.cc

@@ -93,8 +93,12 @@ int main(int argc, char **argv) {
 
   gapc::add_event("end_computation");
 
+#ifndef OUTSIDE
   std::cout << "Answer: \n";
   obj.print_result(std::cout, res);
+#else
+  obj.report_insideoutside(std::cout);
+#endif
 
   gapc::add_event("end_result_pp");
 

src/alt.cc

@@ -84,6 +84,8 @@ Alt::Base *Alt::Simple::clone() {
        i != args.end(); ++i) {
     a->args.push_back((*i)->clone());
   }
+  // necessary to construct correct guards for outside code generation
+  this->m_ys_inside = this->m_ys;
   return a;
 }
 
@@ -1068,25 +1070,58 @@ void Alt::Simple::reset() {
 // by local ys-guards
 
 
-Expr::Base *Alt::Simple::next_index_var(unsigned &k, size_t track,
+Expr::Base *Alt::next_index_var(unsigned &k, size_t track,
   Expr::Base *next_var, Expr::Base *last_var, Expr::Base *right,
-  const Yield::Size &ys, const Yield::Size &lhs, const Yield::Size &rhs) {
-  if (ys.low() != ys.high()) {
-    if (rhs.low() == rhs.high()) {
+  const Yield::Size &ys, const Yield::Size &lhs, const Yield::Size &rhs,
+  std::list<Statement::For*> &loops,
+  bool for_outside_generation, bool outmost, bool is_left_not_right) {
+  /* only for outside NTs:
+   * If left/right of the rhs outside NT are grammar components with at least
+   * one moving boundary, we need to start leftmost/rightmost with a new
+   * loop variable t_x_k.
+   * Note that empty grammar components might occur on left/rightmost positions
+   * like LOC. Once we encounter these components, we already did increase k
+   * previously. Thus, it is not sufficient to "just" look at lhs, ys and rhs.
+   */
+  if (for_outside_generation &&
+      outmost &&
+       // nothing on the left, but moving boundary on the right
+      (((lhs.low() == 0) && (lhs.high() == 0) && (rhs.low() != rhs.high())) ||
+       // nothing on the right, but moving boundary on the left
+       ((rhs.low() == 0) && (rhs.high() == 0) && (lhs.low() != lhs.high()))
+      )
+     ) {
+    outmost = true;
+  } else {
+    outmost = false;
+  }
+
+  if ((ys.low() != ys.high()) || outmost) {
+    if ((rhs.low() == rhs.high()) && !outmost) {
       return right;
     } else {
       std::ostringstream o;
       o << "t_" << track << "_k_" << k;
       k++;
       Expr::Vacc *ivar = new Expr::Vacc(new std::string(o.str()));
 
-      assert(lhs.low() == lhs.high());
+      // start generating for-loop
+      assert((lhs.low() == lhs.high()) || outmost);
       std::pair<Expr::Base*, Expr::Base*> index(0, 0);
 
       Yield::Size lhs_ys(lhs);
       lhs_ys += ys;
 
-      if (rhs.high() == Yield::UP) {
+      /* flip next/last variables for loops that belong to outside NTs and
+       * are right of the rhs outside NT, since we need to iterate towards the
+       * right end of the input sequence */
+      if (for_outside_generation && !is_left_not_right) {
+        Expr::Base* tmp = last_var;
+        last_var = right;
+        right = tmp;
+      }
+
+      if (outmost || (rhs.high() == Yield::UP)) {
         index.first = last_var->plus(lhs_ys.low());
       } else {
         // e.g. second maxsize filter in grammar/forloops5
@@ -1101,7 +1136,7 @@ Expr::Base *Alt::Simple::next_index_var(unsigned &k, size_t track,
 
       Expr::Base *cond = new Expr::Less_Eq(ivar, index.second);
       // e.g. first maxsize filter in grammar/forloops5
-      if (lhs_ys.high() < Yield::UP) {
+      if ((lhs_ys.high() < Yield::UP) && !outmost) {
         cond = new Expr::And(
           cond, new Expr::Less_Eq (ivar, last_var->plus(lhs_ys.high())));
       }
@@ -1110,6 +1145,7 @@ Expr::Base *Alt::Simple::next_index_var(unsigned &k, size_t track,
         new ::Type::Size(), ivar, index.first);
       Statement::For *f = new Statement::For (loopvariable, cond);
       loops.push_back(f);
+
       return ivar;
     }
   } else {
@@ -1141,7 +1177,8 @@ void Alt::Simple::init_indices(
     rhs_ys += ys;
 
     next_var = next_index_var(
-      k, track, next_var, last_var, right, ys, lhs, rhs);
+      k, track, next_var, last_var, right, ys, lhs, rhs,
+      this->loops, false, false, false);
 
     std::pair<Expr::Base*, Expr::Base*> res(0, 0);
     if (lhs.low() == lhs.high()) {
@@ -1510,6 +1547,9 @@ void Alt::Simple::init_guards() {
   std::list<Expr::Base*> l;
   assert(m_ys.tracks() == left_indices.size());
   Yield::Multi::iterator k = m_ys.begin();
+  if (this->is_partof_outside()) {
+    k = m_ys_inside.begin();
+  }
   std::vector<Expr::Base*>::iterator j = right_indices.begin();
   for (std::vector<Expr::Base*>::iterator i = left_indices.begin();
        i != left_indices.end(); ++i, ++j, ++k) {
@@ -1851,6 +1891,28 @@ std::list<Statement::Base*> *Alt::Simple::add_for_loops(
   return stmts;
 }
 
+std::list<Statement::Base*> *Alt::Simple::add_guards(
+    std::list<Statement::Base*> *stmts, bool add_outside_guards) {
+  Statement::If *use_guards = guards;
+  if (add_outside_guards) {
+    use_guards = guards_outside;
+  }
+  if (use_guards) {
+    stmts->push_back(use_guards);
+    if (datatype->simple()->is(::Type::LIST)) {
+      // only call finalize on hash lists
+      if (!ret_decl->rhs && adp_specialization == ADP_Mode::STANDARD) {
+        Statement::Fn_Call *f = new Statement::Fn_Call(
+          Statement::Fn_Call::FINALIZE);
+        f->add_arg(*ret_decl);
+        stmts->push_back(f);
+      }
+    }
+    stmts = &use_guards->then;
+  }
+  return stmts;
+}
+
 void Alt::Simple::codegen(AST &ast) {
   // std::cout << "-----------Simple IN" << std::endl;
 
@@ -1873,19 +1935,10 @@ void Alt::Simple::codegen(AST &ast) {
 
 
   init_guards();
-  if (guards) {
-    stmts->push_back(guards);
-    if (datatype->simple()->is(::Type::LIST)) {
-      // only call finalize on hash lists
-      if (!ret_decl->rhs && adp_specialization == ADP_Mode::STANDARD) {
-        Statement::Fn_Call *f = new Statement::Fn_Call(
-          Statement::Fn_Call::FINALIZE);
-        f->add_arg(*ret_decl);
-        stmts->push_back(f);
-      }
-    }
-    stmts = &guards->then;
+  if (this->is_partof_outside()) {
+    init_outside_guards();
   }
+  stmts = add_guards(stmts, this->is_partof_outside());
 
   init_filter_guards(ast);
 
@@ -1925,11 +1978,21 @@ void Alt::Simple::codegen(AST &ast) {
             }
         }
 
-  // add filter_guards
-  stmts = add_filter_guards(stmts, filter_guards);
+  if (this->is_partof_outside()) {
+    // add for loops for moving boundaries
+    stmts = add_for_loops(stmts, loops, has_index_overlay());
 
-  // add for loops for moving boundaries
-  stmts = add_for_loops(stmts, loops, has_index_overlay());
+    stmts = add_guards(stmts, false);
+
+    // add filter_guards
+    stmts = add_filter_guards(stmts, filter_guards);
+  } else {
+    // add filter_guards
+    stmts = add_filter_guards(stmts, filter_guards);
+
+    // add for loops for moving boundaries
+    stmts = add_for_loops(stmts, loops, has_index_overlay());
+  }
 
   add_subopt_guards(stmts, ast);
 
@@ -2510,7 +2573,14 @@ void Alt::Simple::init_multi_ys() {
 
 
 void Alt::Link::init_multi_ys() {
-  m_ys = nt->multi_ys();
+  if (nt->is_partof_outside()) {
+    m_ys.set_tracks(tracks_);
+    for (Yield::Multi::iterator i = m_ys.begin(); i != m_ys.end(); ++i) {
+      *i = Yield::Size(0, Yield::UP);
+    }
+  } else {
+    m_ys = nt->multi_ys();
+  }
   Base::init_multi_ys();
 }