Changeset 12d8443

Timestamp:

04/30/08 12:16:33 (17 years ago)

Author:

pawelk <pawelk@…>

Branches:

master, help

Children:

28e9ae0

Parents:

19dfa5c

git-author:

pawelk <pawelk@…> (04/30/08 12:16:33)

git-committer:

pawelk <pawelk@…> (04/30/08 12:16:33)

Message:

Naproawiono dgc - teraz obsluguje tez komenatrze w linii z regula.

git-svn-id: ​svn://atos.wmid.amu.edu.pl/utt@34 e293616e-ec6a-49c2-aa92-f4a8b91c5d16

File:

• app/src/dgp/dgc (modified) (3 diffs)

app/src/dgp/dgc

@@ -131 +131 @@
 while(<INPUT>)
 {
-    if(/^\s*AGR\s+(\S+)\s+(\S+)\s*$/)
+    s/#.*//;
+    s/^\s+//;
+    s/\s+$//;
+    if(/^AGR\s+(\S+)\s+(\S+)$/)
     {
         push @{$agr{$1}}, $2;
     }
-    elsif(/^\s*GOV\s+(\S+)\s+(\S+)\s*$/)
+    elsif(/^GOV\s+(\S+)\s+(\S+)$/)
     {
         push @{$gov{$1}}, attr::parse($2);
     }
-    elsif(/^\s*ROLE\s+\S+\s*$/)
+    elsif(/^ROLE\s+\S+$/)
     {
         $roles{$_}=1;
-        print OUTPUT;
-    }
-    elsif(/^\s*SGL\s+\S+\s*$/)
+        print OUTPUT "$_\n";
+    }
+    elsif(/^SGL\s+\S+$/)
     {
         ++$nsgl;
-        print OUTPUT;
-    }
-    elsif(/^\s*REQ\s+(\S+)\s+(\S+)\s*$/)
-    {
-        print OUTPUT "#$_";
+        print OUTPUT "$_\n";
+    }
+    elsif(/^REQ\s+(\S+)\s+(\S+)$/)
+    {
+        print OUTPUT "#$_\n";
         my $cat = attr::parse $1;
         for my $atomcat (keys %cats)
@@ -162 +165 @@
         }
     }
-    elsif(/^\s*LEFT\s+\S+\s*$/)
+    elsif(/^LEFT\s+\S+$/)
     {
         ++$nleft;
-        print OUTPUT;
-    }
-    elsif(/^\s*RIGHT\s+\S+\s*$/)
+        print OUTPUT "$_\n";
+    }
+    elsif(/^RIGHT\s+\S+$/)
     {
         ++$nright;
-        print OUTPUT;
-    }
-    elsif(my ($hs,$ds,$r) = /^\s*LINK\s+($cats_re)\s+($cats_re)\s+(\S+)\s*$/)
-    {
-        print OUTPUT "#$_";
+        print OUTPUT "$_\n";
+    }
+    elsif(my ($hs,$ds,$r) = /^LINK\s+($cats_re)\s+($cats_re)\s+(\S+)$/)
+    {
+        print OUTPUT "#$_\n";
         for my $h ($hs =~ /$attr::cat_re/g)
         {
@@ -183 +186 @@
         }
     }
-    
-    else
-    {
-        print OUTPUT;
+    elsif(/^$/) {
+        # pomijamy puste linie oraz komentarze
+        }
+        else
+    {
+        print STDERR "Illegal format: $_\n";
     }
 }