Changeset a15e59b for src/dgp/grammar.hh

Timestamp:

03/13/12 17:07:34 (13 years ago)

Author:

Tomasz Obrebski <to@…>

Branches:

master

Children:

f4bf33e

Parents:

abd28d1

git-author:

Tomasz Obrebski <to@…> (03/13/12 17:07:34)

git-committer:

Tomasz Obrebski <to@…> (03/13/12 17:07:34)

Message:

dodana opcja --time w dgp, poprawione przesy�anie b�belk�w, obsluga &LEFT, &RIGHT

File:

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

src/dgp/grammar.hh

@@ -192 +192 @@
 //----------------------------------------------------------------------------------------------------
 
-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() )
-    ;
-}
+// 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() )
+//     ;
+// }
 
 //----------------------------------------------------------------------------------------------------
@@ -211 +211 @@
   return 
     !hprop.forbidden[link.role] &&
-    ( dir==1 || !right[link.role] ) &&
-    ( dir==0 || !left[link.role]  ) &&
+    ( dir==1 || (!right[link.role] && !link.props[Prop("RIGHT")]) ) &&  // ZREZYGNOWAÆ Z TABLICY right[<role>]
+    ( dir==0 || (!left[link.role] && !link.props[Prop("LEFT")]) ) &&
     ( dir!=0 || !hprop.init_attached ) &&
     ( dir!=1 || !hprop.fin_attached )