Support OUT parameters in procedures

In addition to IN and IN/OUT

README.md

@@ -148,12 +148,13 @@ The fonts are the fonts from Ubuntu, check licence in file FONT-LICENSE.TXT
 Changelog
 =========
 
-1.2.9 (10/2015)
+1.2.10 (10/2015)
      - Better support of renamePolicy
      - Better handling of models without CIF coordinates
      - Minor bug fixes
      - Forloop syntax error handled correctly when using range
      - support Hex and bit string literals when working with OCTET STRING
+     - support OUT keyword for procedure FPAR
 
 1.2.4 (07/2015)
      - Use version 3.2.x of the ASN1SCC compiler with new -renamePolicy flag

opengeode/icons.py

@@ -2,7 +2,7 @@
 # Resource object code
 #
-# Created: Thu Oct 8 21:18:37 2015
+# Created: Thu Oct 8 22:16:37 2015
 #      by: The Resource Compiler for PySide (Qt v4.8.6)
 #
 # WARNING! All changes made in this file will be lost!

opengeode/ogParser.py

@@ -1868,7 +1868,7 @@ def fpar(root):
         direction = 'in'
         assert param.type == lexer.PARAM
         for child in param.getChildren():
-            if child.type == lexer.INOUT:
+            if child.type in (lexer.INOUT, lexer.OUT):
                 direction = 'out'
             elif child.type == lexer.IN:
                 pass

opengeode/opengeode.py

@@ -116,7 +116,7 @@ except ImportError:
 
 
 __all__ = ['opengeode', 'SDL_Scene', 'SDL_View', 'parse']
-__version__ = '1.2.9'
+__version__ = '1.2.10'
 
 if hasattr(sys, 'frozen'):
     # Detect if we are running on Windows (py2exe-generated)

opengeode/sdl92Lexer.py

-# $ANTLR 3.1.3 Mar 17, 2009 19:23:44 sdl92.g 2015-10-08 21:18:40
+# $ANTLR 3.1.3 Mar 17, 2009 19:23:44 sdl92.g 2015-10-08 22:16:39
 
 import sys
 from antlr3 import *
@@ -29,7 +29,7 @@ RETURN=79
 THIS=153
 CHANNEL=13
 VIAPATH=116
-ENDCONNECTION=130
+ENDCONNECTION=131
 EXPORT=32
 EQ=146
 INFORMAL_TEXT=49
@@ -60,7 +60,7 @@ W=205
 TYPE_INSTANCE=110
 STOP=92
 V=204
-INT=128
+INT=129
 Q=214
 P=192
 S=195
@@ -72,7 +72,7 @@ FI=35
 Z=215
 MINUS_INFINITY=169
 WS=212
-OUT=136
+OUT=128
 NONE=137
 INPUT_NONE=52
 CONSTANT=22
@@ -86,10 +86,10 @@ T__219=219
 T__217=217
 T__218=218
 INPUT=51
-ENDSUBSTRUCTURE=135
+ENDSUBSTRUCTURE=136
 FLOAT=40
-SUBSTRUCTURE=134
-ASTERISK=133
+SUBSTRUCTURE=135
+ASTERISK=134
 T__222=222
 PAREN=68
 T__221=221
@@ -117,11 +117,11 @@ ENDSYNTYPE=30
 SORT=88
 SET=85
 TEXT=103
-SEMI=131
+SEMI=132
 TEXTAREA=104
 BLOCK=12
 CIF=15
-START=129
+START=130
 DECISION=25
 DIV=161
 PROCESS=74
@@ -181,7 +181,7 @@ HYPERLINK=45
 NEWTYPE=58
 Exponent=211
 FOR=42
-ENDSTATE=132
+ENDSTATE=133
 PROCEDURE_NAME=73
 CONSTANTS=23
 ID=118

sdl92.g

@@ -274,9 +274,9 @@ fpar
 
 
 formal_variable_param
-        :       (INOUT | IN)?
+        :       (INOUT | IN | OUT)?
                 variable_id (',' variable_id)* sort
-        ->      ^(PARAM INOUT? IN? variable_id+ sort);
+        ->      ^(PARAM INOUT? IN? OUT? variable_id+ sort);
 
 
 // text_area: TODO add operator description in content

tests/regression/test10/system_structure.pr

@@ -6,7 +6,7 @@ SYSTEM challenge;
 		FPAR
 			IN a T_UInt32,
 			IN b T_UInt32,
-			IN/OUT res T_UInt32;
+			OUT res T_UInt32;
  	EXTERNAL;
 
 	SIGNAL run;