Changeset 3b02b04 for src/dgp/grammar.cc

Timestamp:

01/17/13 20:50:41 (12 years ago)

Author:

Tomasz Obrebski <to@…>

Branches:

master

Children:

d2f119e

Parents:

555c7f8

git-author:

Tomasz Obrebski <to@…> (01/17/13 20:50:41)

git-committer:

Tomasz Obrebski <to@…> (01/17/13 20:50:41)

Message:

prawie ca�kiem nowe dgc, du�e zmiany w dgp, pomniejsze poprawki

File:

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

src/dgp/grammar.cc

@@ -298 +298 @@
         { 
           char cat1[MAXLINE],flags1[MAXLINE],cat2[MAXLINE],flags2[MAXLINE],type[MAXLINE],props[MAXLINE];
-
-          if(sscanf(arg1,"%[^;];%s",cat1,flags1)==1) *flags1='\0'; 
-          if(sscanf(arg2,"%[^;];%s",cat2,flags2)==1) *flags2='\0'; 
-          if(sscanf(arg3,"%[^&]%s",type,props)==1) *props='\0';
+          char* double_slash_position;
+          // pierwszy argument
+          // if(sscanf(arg1,"%[^;];%s",cat1,flags1)==1) *flags1='\0'; 
+          if((double_slash_position=strstr(arg1,"//")) != NULL) // czy s± flagi
+            {
+              int cat_length=double_slash_position-arg1;
+              strncpy(cat1, arg1, cat_length); cat1[cat_length]='\0';
+              strcpy(flags1, arg1+cat_length+2);
+            }
+          else
+            {
+              strcpy(cat1, arg1);
+              flags1[0]='\0';
+            }
+          // drugi argument
+          // if(sscanf(arg2,"%[^;];%s",cat2,flags2)==1) *flags2='\0'; 
+          if((double_slash_position=strstr(arg2,"//")) != NULL) // czy s± flagi
+            {
+              int cat_length=double_slash_position-arg2;
+              strncpy(cat2, arg2, cat_length); cat2[cat_length]='\0';
+              strcpy(flags2, arg2+cat_length+2);
+            }
+          else
+            {
+              strcpy(cat2,arg2);
+              flags2[0]='\0';
+            }
+          // trzeci argument
+          if(sscanf(arg3,"%[^&]%s",type,props)==1) props[0]='\0';
           
-          //      printf("line=%s\n\tcat1=%s flags1=%s cat2=%s flags2=%s type=%s props=%s\n",line,cat1,flags1,cat2,flags2,type,props);
+          // printf("line=%s\n\tcat1=<%s> flags1=%s cat2=<%s> flags2=%s type=<%s> props=%s\n",line,cat1,flags1,cat2,flags2,type,props);
 
           if( chk_cat(cat1) && chk_cat(cat2) && chk_type(type) )
@@ -346 +371 @@
   
   //   compute_gt();
-  
+
   return true;