Changeset d484a32 for src/dgp/grammar.cc

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.cc (modified) (3 diffs)

src/dgp/grammar.cc

@@ -31 +31 @@
   Cat::add(s);
 
-  if(connect.size() <= Cat::count())
-  {
-    connect.resize(Cat::count()+RESIZE_DELTA);
-    for(int i=0; i<connect.size(); ++i)
-      if(connect[i].size() <= Cat::count()) connect[i].resize(Cat::count()+RESIZE_DELTA);
-  }
+  // if(connect.size() <= Cat::count())
+  // {
+  //   connect.resize(Cat::count()+RESIZE_DELTA);
+  //   for(int i=0; i<connect.size(); ++i)
+  //     if(connect[i].size() <= Cat::count()) connect[i].resize(Cat::count()+RESIZE_DELTA);
+  // }
   if(connect1.size() <= Cat::count())
   {
@@ -331 +331 @@
 
           if( chk_cat(cat1) && chk_cat(cat2) && chk_type(type) )
-            set_connect(cat1,parse_flags(flags1,"+"),parse_flags(flags1,"-"),cat2,parse_flags(flags2,"+"),parse_flags(flags2,"-"),type,parse_props(props));
+            set_connect(cat1,parse_flags(flags1,"+"),parse_flags(flags1,"-"),cat2,parse_flags(flags2,"+"),parse_flags(flags2,"-"),type,parse_props(props),lineno);
           else if( chk_cat(cat1) && chk_cat(cat2) && chk_long(type) )
             {
@@ -504 +504 @@
       if(obl[c].test(r)) fprintf(f,"REQ\t%s\t%s\n",c.str(),r.str());
   
-  for(Cat c=1; c<Cat::count(); ++c)
-    for(Cat d=1; d<Cat::count(); ++d)
-      for(Role t=1; t<Role::count(); ++t)
-        if(connect[c][d].count(t))
-          fprintf(f,"LINK\t%s\t%s\t%s\n",c.str(),d.str(),t.str());
+  // for(Cat c=1; c<Cat::count(); ++c)
+  //   for(Cat d=1; d<Cat::count(); ++d)
+  //     for(Role t=1; t<Role::count(); ++t)
+  //    if(connect[c][d].count(t))
+  //         fprintf(f,"LINK\t%s\t%s\t%s\n",c.str(),d.str(),t.str());
 
   for(LongRel i=1; i<LongRel::count(); ++i)