Added support for XML-NODE-TYPE in DEFINE DATASET

Author: jcaillon

src/main/antlr/JPTreeParser.g

@@ -1404,9 +1404,9 @@ definebuttonstate
 
 definedatasetstate
 	:	#(	DEFINE (def_shared)? def_modifiers DATASET ID
-			(namespace_uri)? (namespace_prefix)? (xml_node_name)?
-			( #(SERIALIZENAME QSTRING) )?
-			(SERIALIZEHIDDEN)?
+			(namespace_uri)? (namespace_prefix)?
+			(xml_node_name)? (serialize_name)?
+			(xml_node_type)? (SERIALIZEHIDDEN)?
 			(REFERENCEONLY)?
 			FOR RECORD_NAME (COMMA RECORD_NAME)*
 			( data_relation ( (COMMA)? data_relation)* )?
@@ -1605,8 +1605,8 @@ definesubmenustate
 definetemptablestate
 	:	#(	DEFINE (def_shared)? def_modifiers TEMPTABLE ID
 			(UNDO|NOUNDO)?
-			(namespace_uri)? (namespace_prefix)? (xml_node_name)?
-			( #(SERIALIZENAME QSTRING) )?
+			(namespace_uri)? (namespace_prefix)?
+			(xml_node_name)? (serialize_name)?
 			(REFERENCEONLY)?
 			(def_table_like)?
 			(label_constant)?
@@ -1804,7 +1804,7 @@ fieldoption
 	|	xml_data_type
 	|	xml_node_name
 	|	xml_node_type
-	|	#(SERIALIZENAME QSTRING)
+	|	serialize_name
 	|	SERIALIZEHIDDEN
 	;
 
@@ -2843,10 +2843,9 @@ widget_id: #(WIDGETID expression ) ;
 
 xml_data_type: #(XMLDATATYPE constant ) ;
 xml_node_name: #(XMLNODENAME constant ) ;
+serialize_name: #(SERIALIZENAME constant ) ;
 xml_node_type: #(XMLNODETYPE constant ) ;
 
-
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Begin SQL
 ///////////////////////////////////////////////////////////////////////////////////////////////////

src/main/antlr/TreeParser01.g

@@ -673,10 +673,10 @@ definebuttonstate
 definedatasetstate
 	:	#(	def:DEFINE (def_shared)? def_modifiers DATASET
 			id:ID { push(action.defineSymbol(DATASET, #def, #id)); }
-			(namespace_uri)? (namespace_prefix)? (xml_node_name)?
-			( #(SERIALIZENAME QSTRING) )?
-			(SERIALIZEHIDDEN)?
-			(REFERENCEONLY)?
+            (namespace_uri)? (namespace_prefix)?
+            (xml_node_name)? (serialize_name)?
+            (xml_node_type)? (SERIALIZEHIDDEN)?
+            (REFERENCEONLY)?
 			FOR tb1:tbl[CQ.INIT] {action.datasetTable(#tb1);}
 			(COMMA tb2:tbl[CQ.INIT] {action.datasetTable(#tb2);} )*
 			( data_relation ( (COMMA)? data_relation)* )?

src/main/antlr/proparse.g

@@ -2048,8 +2048,9 @@ button_opt
 
 definedatasetstate
 	:	DATASET identifier
-		(namespace_uri)? (namespace_prefix)? (xml_node_name)? (serialize_name)?
-		(SERIALIZEHIDDEN)?
+		(namespace_uri)? (namespace_prefix)?
+		(xml_node_name)? (serialize_name)?
+		(xml_node_type)? (SERIALIZEHIDDEN)?
 		(REFERENCEONLY)?
 		FOR record (COMMA record)*
 		(data_relation ( (COMMA)? data_relation)* )?
@@ -2273,7 +2274,8 @@ definetemptablestate
 			support.defTable(tableName, SymbolScope.FieldType.TTABLE);
 		}
 		(UNDO|NOUNDO)?
-		(namespace_uri)? (namespace_prefix)? (xml_node_name)? (serialize_name)?
+		(namespace_uri)? (namespace_prefix)?
+		(xml_node_name)? (serialize_name)?
 		(REFERENCEONLY)?
 		(def_table_like)?
 		(label_constant)?
@@ -3686,10 +3688,6 @@ selectionlist_opt
 	|	sizephrase
 	;
 
-serialize_name
-	:	SERIALIZENAME^ QSTRING
-	;
-
 setstate
 	:	SET^ (options{greedy=true;}: stream_name_or_handle)? (UNLESSHIDDEN)? form_items_or_record
 		(goonphrase)?
@@ -4095,7 +4093,7 @@ widget_id: WIDGETID^ expression ;
 xml_data_type: XMLDATATYPE^ constant ;
 xml_node_name: XMLNODENAME^ constant ;
 xml_node_type: XMLNODETYPE^ constant ;
-
+serialize_name: SERIALIZENAME^ constant ;
 
 // Documentation bugs:
 // - PARENT, ROWID, and RETURNS can be used as field names