Changeset d484a32 for src/dgp/grammar.hh

Timestamp:

10/24/14 13:07:15 (10 years ago)

Author:

Tomasz Obrebski <obrebski@…>

Branches:

master

Children:

acbabee

Parents:

56c300b

git-author:

Tomasz Obrebski <obrebski@…> (10/24/14 13:07:15)

git-committer:

Tomasz Obrebski <obrebski@…> (10/24/14 13:07:15)

Message:

some unnecessary variables/functions deleted

File:

• src/dgp/grammar.hh (modified) (7 diffs)

src/dgp/grammar.hh

@@ -27 +27 @@
 struct Link
 {
-  Link(Role r, Flag dfplus="NULL", Flag dfminus="NULL") : role(r), dflagplus(dfplus), dflagminus(dfminus) { }
-  Link(Role r, PropSet ps=EmptyPropSet, Flag hfp="NULL", Flag hfm="NULL", Flag dfp="NULL", Flag dfm="NULL")
+  // Link(Role r, Flag dfplus="NULL", Flag dfminus="NULL") : role(r), dflagplus(dfplus), dflagminus(dfminus) { }
+  Link(Role r, PropSet ps=EmptyPropSet, Flag hfp="NULL", Flag hfm="NULL", Flag dfp="NULL", Flag dfm="NULL", int lineno=0)
     : role(r), props(ps), hflagplus(hfp), hflagminus(hfm), dflagplus(dfp), dflagminus(dfm) { }
   //Link(Role r) : role(r), dflagplus("NULL") { }
@@ -38 +38 @@
   Flag dflagminus;
   PropSet props;
+  int lineno;
 
   bool operator<(const Link& l) const 
@@ -67 +68 @@
   Grammar() {} ;
 
-  Roles&  connectable(Cat h, Cat d);
-  Roles   connectable(Cat h, Cat d, FlagSet f, FlagSet df);
-
   list<const Link*> connectable2(Cat h, Cat d, FlagSet hfs, FlagSet dfs);
 
@@ -109 +107 @@
   vector< FlagSet >            pass;     //[Role]
 
-  vector< vector< Roles > >    connect;  //[Cat][Cat]
+  // vector< vector< Roles > >    connect;  //[Cat][Cat]
 
   vector< vector< Links > >    connect1; //[Cat][Cat]
@@ -143 +141 @@
   //  void set_connect(Cat c, Cat d, Flag f, Role r)   { connect1[c][d].insert(Link(r,f)); }
 
-  void set_connect(Cat h, Flag hfp, Flag hfm, Cat d, Flag dfp, Flag dfm, Role r, PropSet ps )   { connect1[h][d].insert(Link(r,ps,hfp,hfm,dfp,dfm)); }
+  void set_connect(Cat h, Flag hfp, Flag hfm, Cat d, Flag dfp, Flag dfm, Role r, PropSet ps, int lineno )   { connect1[h][d].insert(Link(r,ps,hfp,hfm,dfp,dfm,lineno)); }
 
   void set_include(Role r, Role s)         { include[r].set(s); }
@@ -160 +158 @@
 
 inline
-Roles&  Grammar::connectable(Cat h, Cat d)
-{
-  return connect[h][d];
-}
-
-//----------------------------------------------------------------------------------------------------
-
-inline
-Roles Grammar::connectable(Cat h, Cat d, FlagSet hfs, FlagSet dfs)  // ZBYT WOLNE!!!!!!!!!!!!!!!!!!!!!!!!!! (-> Roles&)
-{
-  Roles ret;
-  for(Links::const_iterator l = connect1[h][d].begin(); l != connect1[h][d].end(); l++)
-    if( (l->hflagplus==0 || hfs[l->hflagplus]) && (l->hflagminus==0 || !hfs[l->hflagminus]) )
-      if( (l->dflagplus==0 || dfs[l->dflagplus]) && (l->dflagminus==0 || !dfs[l->dflagminus]) )
-        ret.insert(l->role);
-  return ret;
-}
-
-//----------------------------------------------------------------------------------------------------
-
-inline
 list<const Link*> Grammar::connectable2(Cat h, Cat d, FlagSet hfs, FlagSet dfs)  // ZBYT WOLNE!!!!!!!!!!!!!!!!!!!!!!!!!! (-> Roles&)
 {
@@ -190 +167 @@
   return ret;
 }
-
-//----------------------------------------------------------------------------------------------------
-
-// inline
-// bool Grammar::check_constr(NodeProp& hprop, NodeProp& dprop, int dir, Role role)    // dir: 0-left 1-right
-// {
-//   return 
-//     !hprop.forbidden[role] &&
-//     ( dir==1 || !right[role] ) &&
-//     ( dir==0 || !left[role]  ) &&
-//     ( dir==1 || (hprop.attached&init).none() ) &&
-//     ( dir==0 || (hprop.attached&fin).none() )
-//     ;
-// }
 
 //----------------------------------------------------------------------------------------------------