[Scstudio-commits] SF.net SVN: scstudio:[248] trunk

[<ma...@us...>]

Revision: 248
          http://scstudio.svn.sourceforge.net/scstudio/?rev=248&view=rev
Author:   madzin
Date:     2009-06-01 13:02:54 +0000 (Mon, 01 Jun 2009)

Log Message:
-----------
Bachelor's thesis

Modified Paths:
--------------
    trunk/src/data/Z120/Context.cpp
    trunk/src/data/Z120/Context.h
    trunk/src/data/Z120/Z120.g
    trunk/tests/z120_test.cpp

Modified: trunk/src/data/Z120/Context.cpp
===================================================================
--- trunk/src/data/Z120/Context.cpp	2009-05-13 08:17:40 UTC (rev 247)
+++ trunk/src/data/Z120/Context.cpp	2009-06-01 13:02:54 UTC (rev 248)
@@ -90,6 +90,10 @@
   context->msc_name = name;
 }
 
+void my_print(char* a){
+  std::cerr << a << std::endl;
+}
+
 /*
  * Set beginning values
  */
@@ -305,7 +309,7 @@
   {
     CoregionEventPtr event1 = boost::dynamic_pointer_cast<CoregionEvent>(event);
     if(event1 != NULL){
-//      context->named_events.insert(std::make_pair(context->event_name, event1));
+      context->named_events.insert(std::make_pair(context->event_name, event1));
     }
   }
   

Modified: trunk/src/data/Z120/Context.h
===================================================================
--- trunk/src/data/Z120/Context.h	2009-05-13 08:17:40 UTC (rev 247)
+++ trunk/src/data/Z120/Context.h	2009-06-01 13:02:54 UTC (rev 248)
@@ -32,6 +32,8 @@
 struct s_Msc;
 struct s_Z120;
 
+void my_print(char* a);
+
 void set_msc_name_fun(struct Context* context, char* name);
 
 void init(struct Context* context);
@@ -78,7 +80,6 @@
 void set_instance_name_fun(struct Context* context, char* name);
 
 void set_event_name_fun(struct Context* context, char* name);
-//  BMscStruct* get_bmsc();
 
 //HMsc
 void new_hmsc_fun(struct Context* context);

Modified: trunk/src/data/Z120/Z120.g
===================================================================
--- trunk/src/data/Z120/Z120.g	2009-05-13 08:17:40 UTC (rev 247)
+++ trunk/src/data/Z120/Z120.g	2009-06-01 13:02:54 UTC (rev 248)
@@ -99,7 +99,7 @@
    '}'
 ;
 
-fragment
+//fragment
 Left_Open:
    '('
 ;
@@ -109,7 +109,7 @@
    Left_Square_Bracket
 ;
 
-fragment
+//fragment
 Right_Open:
    ')'
 ;
@@ -165,7 +165,7 @@
  | Other_Character
  | Special
  | '.' | '_' | ' '
- | Apostrophe Apostrophe)* Apostrophe
+ | Apostrophe Apostrophe)* Apostrophe 
 ;
 
 fragment
@@ -268,7 +268,6 @@
    'text' Character_String end
 ;
 
-
 // ----- Message Sequence Chart Document
 
 // non-standard: Z.120 doesn't define top-level nonterminal
@@ -280,7 +279,7 @@
        add_z_fun(context, $my_z120);
      }
    }
-   (('mscdocument' instance_kind end)? (message_sequence_chart)*)
+   ((document_head | 'mscdocument' instance_kind end)? (message_sequence_chart)*)
    {
      check_references_fun(context);
      $my_msc = get_total_msc_fun(context);
@@ -1000,7 +999,7 @@
 ;
 
 Escapechar:
-//   Delim Character_String Delim
+   Delim Character_String Delim
 ;
 
 
@@ -1501,7 +1500,7 @@
    {
      add_connect_name_fun(context, (char*) ($NAME.text->chars));
    }
-   (',' label_list)*  //POZOR!!! upravena gramatika
+   (',' label_list)*  
 ;
 
 intermediate_node:
@@ -1532,7 +1531,6 @@
 
 intermediate_node_type:
    timeable_node | untimeable_node
-//   untimeable_node | timeable_node  //the rules have to be replaced because the connection_node is empty and timenode can be empty too because in the timeable_node is each of non-terminal in ()? 
 ;
 
 untimeable_node:

Modified: trunk/tests/z120_test.cpp
===================================================================
--- trunk/tests/z120_test.cpp	2009-05-13 08:17:40 UTC (rev 247)
+++ trunk/tests/z120_test.cpp	2009-06-01 13:02:54 UTC (rev 248)
@@ -61,6 +61,10 @@
     std::cerr << "ERROR: Syntax error in " << argv[1] << std::endl;
     return 1;
   }
+  else
+  {
+//    std::cerr << "Reading of MSC failed" << std::endl;
+  }
 
   char *path = strdup(argv[1]);
   char *filename = extract_filename(path);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.