Various changes on textx and pyflies languages.

examples/textx/experiment.pf

@@ -49,7 +49,7 @@ experiment {
   # Variable_name, type, optional label
   # Type can be: str, int, float or enumerated list
   subject {
-    full_name str "First and last name"
+    full_name string "First and last name"
     age int
     gender [Male, Female] "Gender"
   }

examples/textx/pyflies.tx

 /*
-  This is a TextX definition of pyFlies DSL for Reaction Time test
+  This is a TextX specification of pyFlies DSL for Reaction Time test
   experiments definition.
   Author: Igor R. Dejanovic <igor DOT dejanovic AT gmail DOT com>
   Copyright: (c) 2014 Igor R. Dejanovic <igor DOT dejanovic AT gmail DOT com>
@@ -21,7 +21,7 @@ TestType:
 ;
 
 TestParam:
-  name=ID TestParamValue label=TestParamLabel?
+  name=ID TestParamValue
 ;
 
 TestParamValue:
@@ -34,7 +34,7 @@ TestParamLabel:
 
 
 Block:
-  Intro|Test|Sequence|Randomize
+  Intro|Test|Sequence|Randomize|Subject
 ;
 
 Experiment:
@@ -65,6 +65,20 @@ Intro:
   /====*/
 ;
 
+Subject:
+  'subject' '{'
+    attribute+=SubjectAttribute
+  '}'
+;
+
+SubjectAttribute:
+  name=ID type=("int"|"string"|"float"|Enum)  label=STRING?
+;
+
+Enum:
+  '[' values+={ID ','} ']'
+;
+
 // Special rule for comments
 Comment:
   /#.*$/