Merge pull request #1 from ccleaud/master

From ccleaud

Author: jcaillon

build.number

@@ -1,2 +1,2 @@
-#Mon Mar 07 23:00:00 PDT 2016
-build.number=1133
+#Sun Oct 16 21:00:00 PDT 2016
+build.number=1134

build/build.txt

@@ -10,6 +10,6 @@
 5. paste the file in the temporary directory
 
 6. open a command prompt on that directory
-7. use this command line "ikvmc.exe  -out:proparse.net.dll  -keyfile:proparse.snk  -version:4.0.1.1133  proparse-1.0.jar  .\lib\*"
+7. use this command line "ikvmc.exe  -out:proparse.net.dll  -keyfile:proparse.snk  -version:4.0.1.1134  proparse-1.0.jar  .\lib\*"
 
 8. enjoy!

src/main/antlr/JPTreeParser.g

@@ -413,7 +413,7 @@ functioncall
 	|	#(PAGENUMBER (LEFTPAREN ID RIGHTPAREN)? )
 	|	#(PAGESIZE_KW (LEFTPAREN ID RIGHTPAREN)? )
 	|	rawfunc // is also a pseudfn.
-	|	#(SEEK LEFTPAREN (INPUT|OUTPUT|ID|STREAMHANDLE expression) RIGHTPAREN )
+	|	#(SEEK LEFTPAREN (INPUT|OUTPUT|ID|STREAMHANDLE expression) RIGHTPAREN )
 	|	substringfunc // is also a pseudfn.
 	|	#(SUPER (parameterlist)? )
 	|	#(TIMEZONE (funargs)? )
@@ -1227,7 +1227,7 @@ createsoapheaderentryrefstate
 	;
 
 createsocketstate
-	:	#(CREATE SOCKET field (NOERROR_KW)? state_end )
+	: #(CREATE SOCKET (field | widattr) (NOERROR_KW)? state_end )
 	;
 
 createtemptablestate
@@ -1410,7 +1410,7 @@ definedatasetstate
 			(REFERENCEONLY)?
 			FOR RECORD_NAME (COMMA RECORD_NAME)*
 			( data_relation ( (COMMA)? data_relation)* )?
-			( parent_id_relation ( (COMMA)? parent_id_relation)* )?
+			( parent_id_relation ( (COMMA)? parent_id_relation)* )?
 			state_end
 		)
 	;
@@ -1425,14 +1425,14 @@ data_relation
 			)*
 		)
 	;
-parent_id_relation
-	:	#(	PARENTIDRELATION (ID)?
-			FOR RECORD_NAME COMMA RECORD_NAME
-			PARENTIDFIELD field
-			( PARENTFIELDSBEFORE LEFTPAREN field (COMMA field)* RIGHTPAREN)?
-			( PARENTFIELDSAFTER  LEFTPAREN field (COMMA field)* RIGHTPAREN)?
-		)
-	;
+parent_id_relation
+	:	#(	PARENTIDRELATION (ID)?
+			FOR RECORD_NAME COMMA RECORD_NAME
+			PARENTIDFIELD field
+			( PARENTFIELDSBEFORE LEFTPAREN field (COMMA field)* RIGHTPAREN)?
+			( PARENTFIELDSAFTER  LEFTPAREN field (COMMA field)* RIGHTPAREN)?
+		)
+	;
 field_mapping_phrase
 	:	#(RELATIONFIELDS LEFTPAREN field COMMA field ( COMMA field COMMA field )* RIGHTPAREN )
 	;

src/main/antlr/TreeParser01.g

@@ -185,7 +185,7 @@ functioncall
 	|	#(PAGENUMBER (LEFTPAREN ID RIGHTPAREN)? )
 	|	#(PAGESIZE_KW (LEFTPAREN ID RIGHTPAREN)? )
 	|	rawfunc // is also a pseudfn.
-	|	#(SEEK LEFTPAREN (INPUT|OUTPUT|ID|STREAMHANDLE expression) RIGHTPAREN )
+	|	#(SEEK LEFTPAREN (INPUT|OUTPUT|ID|STREAMHANDLE expression) RIGHTPAREN )
 	|	substringfunc // is also a pseudfn.
 	|	#(sr:SUPER {action.callBegin(#sr);} (parameterlist)? {action.callEnd();} )
 	|	#(TIMEZONE (funargs)? )
@@ -313,7 +313,7 @@ widname
 	|	XDOCUMENT ID
 	|	XNODEREF ID
 	|	SOCKET ID
-	|	STREAM ID
+	|	STREAM ID
 	;
 
 tbl[int contextQualifier]
@@ -561,7 +561,7 @@ createserversocketstate
 	;
 
 createsocketstate
-	:	#(CREATE SOCKET fld[CQ.UPDATING] (NOERROR_KW)? state_end )
+	:	#(CREATE SOCKET (fld[CQ.UPDATING] | widattr) (NOERROR_KW)? state_end )
 	;
 
 createtemptablestate
@@ -679,7 +679,7 @@ definedatasetstate
 			FOR tb1:tbl[CQ.INIT] {action.datasetTable(#tb1);}
 			(COMMA tb2:tbl[CQ.INIT] {action.datasetTable(#tb2);} )*
 			( data_relation ( (COMMA)? data_relation)* )?
-			( parent_id_relation ( (COMMA)? parent_id_relation)* )?
+			( parent_id_relation ( (COMMA)? parent_id_relation)* )?
 			state_end
 			{ action.addToSymbolScope(pop()); }
 		)
@@ -695,16 +695,16 @@ data_relation
 			)*
 		)
 	;
-parent_id_relation
-	:	#(	PARENTIDRELATION (ID)?
-			FOR tbl[CQ.INIT] COMMA tbl[CQ.INIT] // TODO Verify context qualifier
-			PARENTIDFIELD fld1[CQ.SYMBOL]       // TODO Verify context qualifier
-			( PARENTFIELDSBEFORE LEFTPAREN fld1[CQ.SYMBOL] (COMMA fld1[CQ.SYMBOL])* RIGHTPAREN)? // TODO Verify context qualifier
-			( PARENTFIELDSAFTER  LEFTPAREN fld1[CQ.SYMBOL] (COMMA fld1[CQ.SYMBOL])* RIGHTPAREN)? // TODO Verify context qualifier
-			
-		)
-	;
-
+parent_id_relation
+	:	#(	PARENTIDRELATION (ID)?
+			FOR tbl[CQ.INIT] COMMA tbl[CQ.INIT] // TODO Verify context qualifier
+			PARENTIDFIELD fld1[CQ.SYMBOL]       // TODO Verify context qualifier
+			( PARENTFIELDSBEFORE LEFTPAREN fld1[CQ.SYMBOL] (COMMA fld1[CQ.SYMBOL])* RIGHTPAREN)? // TODO Verify context qualifier
+			( PARENTFIELDSAFTER  LEFTPAREN fld1[CQ.SYMBOL] (COMMA fld1[CQ.SYMBOL])* RIGHTPAREN)? // TODO Verify context qualifier
+			
+		)
+	;
+
 field_mapping_phrase
 	:	#(RELATIONFIELDS LEFTPAREN fld2[CQ.SYMBOL] COMMA fld1[CQ.SYMBOL]
 		( COMMA fld2[CQ.SYMBOL] COMMA fld1[CQ.SYMBOL] )* RIGHTPAREN )

src/main/antlr/proparse.g

@@ -1748,7 +1748,7 @@ createserversocketstate
 	;
 
 createsocketstate
-	:	CREATE^ SOCKET field (NOERROR_KW)? state_end
+	:	CREATE^ SOCKET exprt (NOERROR_KW)? state_end
 		{sthd(##,SOCKET);}
 	;