pntool-developers Mailing List for A Concurrency Tool Suite (Page 9)
Brought to you by:
compaqdrew,
miordache
You can subscribe to this list here.
2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(69) |
Jul
(86) |
Aug
(33) |
Sep
|
Oct
|
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2011 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(3) |
Jun
(1) |
Jul
(10) |
Aug
(2) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
From: <com...@us...> - 2009-06-18 03:44:42
|
Revision: 69 http://pntool.svn.sourceforge.net/pntool/?rev=69&view=rev Author: compaqdrew Date: 2009-06-18 03:44:40 +0000 (Thu, 18 Jun 2009) Log Message: ----------- test_supervisor updated to new directory structure Modified Paths: -------------- codegen/src/codegen.xcodeproj/drew.mode1v3 codegen/src/codegen.xcodeproj/drew.pbxuser codegen/test_supervisor.sh Modified: codegen/src/codegen.xcodeproj/drew.mode1v3 =================================================================== --- codegen/src/codegen.xcodeproj/drew.mode1v3 2009-06-17 23:58:11 UTC (rev 68) +++ codegen/src/codegen.xcodeproj/drew.mode1v3 2009-06-18 03:44:40 UTC (rev 69) @@ -216,10 +216,10 @@ <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> - <string>3A752B8F0FE6A2DC00091C76</string> + <string>3AA340FA0FE9EC1D004E156E</string> <key>history</key> <array> - <string>3ACFDDF60FDA941000C504DE</string> + <string>3A752B8F0FE6A2DC00091C76</string> </array> </dict> <key>SplitCount</key> @@ -235,7 +235,7 @@ <key>PBXModuleWindowStatusBarHidden2</key> <false/> <key>RubberWindowFrame</key> - <string>130 147 1027 855 0 0 1280 1002 </string> + <string>336 173 1027 855 0 0 1680 1028 </string> </dict> </dict> <dict> @@ -256,10 +256,10 @@ <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> - <string>3A752B900FE6A2DC00091C76</string> + <string>3AA340FB0FE9EC1D004E156E</string> <key>history</key> <array> - <string>3ACFDDF70FDA941000C504DE</string> + <string>3A752B900FE6A2DC00091C76</string> </array> </dict> <key>SplitCount</key> @@ -275,7 +275,7 @@ <key>PBXModuleWindowStatusBarHidden2</key> <false/> <key>RubberWindowFrame</key> - <string>119 219 981 583 0 0 1280 1002 </string> + <string>278 231 981 583 0 0 1680 1028 </string> </dict> </dict> </array> @@ -387,7 +387,7 @@ <real>186</real> </array> <key>RubberWindowFrame</key> - <string>0 146 1280 856 0 0 1280 1002 </string> + <string>400 172 1280 856 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXSmartGroupTreeModule</string> @@ -415,7 +415,7 @@ <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> - <string>3A752B8C0FE6A2DC00091C76</string> + <string>3AA340F70FE9EC1D004E156E</string> <key>history</key> <array> <string>3A7FCEED0FBC046D00EF8097</string> @@ -436,7 +436,7 @@ <string>3ACFDD190FDA866300C504DE</string> <string>3A752B860FE6A2DC00091C76</string> <string>3A752B870FE6A2DC00091C76</string> - <string>3A752B880FE6A2DC00091C76</string> + <string>3A752B8C0FE6A2DC00091C76</string> </array> <key>prevStack</key> <array> @@ -459,9 +459,6 @@ <string>3A65A75C0FC0D5C2004E4F00</string> <string>3A65A7690FC0D8CA004E4F00</string> <string>3A65A77A0FC0FC3F004E4F00</string> - <string>3A752B890FE6A2DC00091C76</string> - <string>3A752B8A0FE6A2DC00091C76</string> - <string>3A752B8B0FE6A2DC00091C76</string> </array> </dict> <key>SplitCount</key> @@ -475,7 +472,7 @@ <key>Frame</key> <string>{{0, 0}, {1072, 658}}</string> <key>RubberWindowFrame</key> - <string>0 146 1280 856 0 0 1280 1002 </string> + <string>400 172 1280 856 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> @@ -495,7 +492,7 @@ <key>Frame</key> <string>{{0, 663}, {1072, 152}}</string> <key>RubberWindowFrame</key> - <string>0 146 1280 856 0 0 1280 1002 </string> + <string>400 172 1280 856 0 0 1680 1028 </string> </dict> <key>Module</key> <string>XCDetailModule</string> @@ -519,9 +516,9 @@ </array> <key>TableOfContents</key> <array> - <string>3A752B8D0FE6A2DC00091C76</string> + <string>3AA340F80FE9EC1D004E156E</string> <string>1CE0B1FE06471DED0097A5F4</string> - <string>3A752B8E0FE6A2DC00091C76</string> + <string>3AA340F90FE9EC1D004E156E</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> </array> @@ -655,18 +652,14 @@ <integer>5</integer> <key>WindowOrderList</key> <array> - <string>3A752B990FE6A2DC00091C76</string> - <string>3A752B9A0FE6A2DC00091C76</string> - <string>3A752B9B0FE6A2DC00091C76</string> - <string>1C78EAAD065D492600B07095</string> + <string>3A232CB10FB21F7F00A5C7C2</string> <string>1CD10A99069EF8BA00B06720</string> <string>3A13FC520FDA612F0051F833</string> <string>3ACFDCB10FDA81C200C504DE</string> - <string>3A232CB10FB21F7F00A5C7C2</string> - <string>/Users/drew/Dropbox/Code/pntool/codegen/src/codegen.xcodeproj</string> + <string>/Volumes/Code/pntool/codegen/src/codegen.xcodeproj</string> </array> <key>WindowString</key> - <string>0 146 1280 856 0 0 1280 1002 </string> + <string>400 172 1280 856 0 0 1680 1028 </string> <key>WindowToolsV3</key> <array> <dict> @@ -696,7 +689,7 @@ <key>Frame</key> <string>{{0, 0}, {1280, 602}}</string> <key>RubberWindowFrame</key> - <string>160 -58 1280 855 0 0 1280 1002 </string> + <string>560 -58 1280 855 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> @@ -704,8 +697,6 @@ <string>602pt</string> </dict> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> @@ -722,7 +713,7 @@ <key>Frame</key> <string>{{0, 607}, {1280, 207}}</string> <key>RubberWindowFrame</key> - <string>160 -58 1280 855 0 0 1280 1002 </string> + <string>560 -58 1280 855 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXBuildResultsModule</string> @@ -745,18 +736,18 @@ <key>TableOfContents</key> <array> <string>3A232CB10FB21F7F00A5C7C2</string> - <string>3A752B910FE6A2DC00091C76</string> + <string>3AA340FC0FE9EC1D004E156E</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.buildV3</string> <key>WindowString</key> - <string>160 -58 1280 855 0 0 1280 1002 </string> + <string>560 -58 1280 855 0 0 1680 1028 </string> <key>WindowToolGUID</key> <string>3A232CB10FB21F7F00A5C7C2</string> <key>WindowToolIsVisible</key> - <true/> + <false/> </dict> <dict> <key>FirstTimeWindowDisplayed</key> @@ -839,10 +830,10 @@ <key>Frame</key> <string>{{456, 0}, {544, 297}}</string> <key>RubberWindowFrame</key> - <string>173 384 1000 597 0 0 1280 1002 </string> + <string>420 408 1000 597 0 0 1680 1028 </string> </dict> <key>RubberWindowFrame</key> - <string>173 384 1000 597 0 0 1280 1002 </string> + <string>420 408 1000 597 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXDebugSessionModule</string> @@ -865,18 +856,18 @@ <key>TableOfContents</key> <array> <string>1CD10A99069EF8BA00B06720</string> - <string>3A752B920FE6A2DC00091C76</string> + <string>3AA340FD0FE9EC1D004E156E</string> <string>1C162984064C10D400B95A72</string> - <string>3A752B930FE6A2DC00091C76</string> - <string>3A752B940FE6A2DC00091C76</string> - <string>3A752B950FE6A2DC00091C76</string> - <string>3A752B960FE6A2DC00091C76</string> - <string>3A752B970FE6A2DC00091C76</string> + <string>3AA340FE0FE9EC1D004E156E</string> + <string>3AA340FF0FE9EC1D004E156E</string> + <string>3AA341000FE9EC1D004E156E</string> + <string>3AA341010FE9EC1D004E156E</string> + <string>3AA341020FE9EC1D004E156E</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debugV3</string> <key>WindowString</key> - <string>173 384 1000 597 0 0 1280 1002 </string> + <string>420 408 1000 597 0 0 1680 1028 </string> <key>WindowToolGUID</key> <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> Modified: codegen/src/codegen.xcodeproj/drew.pbxuser =================================================================== --- codegen/src/codegen.xcodeproj/drew.pbxuser 2009-06-17 23:58:11 UTC (rev 68) +++ codegen/src/codegen.xcodeproj/drew.pbxuser 2009-06-18 03:44:40 UTC (rev 69) @@ -76,8 +76,8 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 266773131; - PBXWorkspaceStateSaveDate = 266773131; + PBXPerProjectTemplateStateSaveDate = 266988558; + PBXWorkspaceStateSaveDate = 266988558; }; perUserProjectItems = { 3A232C980FB21F7F00A5C7C2 = 3A232C980FB21F7F00A5C7C2 /* PBXTextBookmark */; @@ -104,15 +104,15 @@ 3A65A77A0FC0FC3F004E4F00 = 3A65A77A0FC0FC3F004E4F00 /* PBXTextBookmark */; 3A65A9540FC12C01004E4F00 = 3A65A9540FC12C01004E4F00 /* PBXTextBookmark */; 3A65A9550FC12C01004E4F00 = 3A65A9550FC12C01004E4F00 /* PBXTextBookmark */; - 3A752B860FE6A2DC00091C76 /* PBXTextBookmark */ = 3A752B860FE6A2DC00091C76 /* PBXTextBookmark */; - 3A752B870FE6A2DC00091C76 /* PBXTextBookmark */ = 3A752B870FE6A2DC00091C76 /* PBXTextBookmark */; - 3A752B880FE6A2DC00091C76 /* PBXTextBookmark */ = 3A752B880FE6A2DC00091C76 /* PBXTextBookmark */; - 3A752B890FE6A2DC00091C76 /* PBXTextBookmark */ = 3A752B890FE6A2DC00091C76 /* PBXTextBookmark */; - 3A752B8A0FE6A2DC00091C76 /* PBXTextBookmark */ = 3A752B8A0FE6A2DC00091C76 /* PBXTextBookmark */; - 3A752B8B0FE6A2DC00091C76 /* PBXTextBookmark */ = 3A752B8B0FE6A2DC00091C76 /* PBXTextBookmark */; - 3A752B8C0FE6A2DC00091C76 /* PBXTextBookmark */ = 3A752B8C0FE6A2DC00091C76 /* PBXTextBookmark */; - 3A752B8F0FE6A2DC00091C76 /* PBXTextBookmark */ = 3A752B8F0FE6A2DC00091C76 /* PBXTextBookmark */; - 3A752B900FE6A2DC00091C76 /* PBXTextBookmark */ = 3A752B900FE6A2DC00091C76 /* PBXTextBookmark */; + 3A752B860FE6A2DC00091C76 = 3A752B860FE6A2DC00091C76 /* PBXTextBookmark */; + 3A752B870FE6A2DC00091C76 = 3A752B870FE6A2DC00091C76 /* PBXTextBookmark */; + 3A752B880FE6A2DC00091C76 = 3A752B880FE6A2DC00091C76 /* PBXTextBookmark */; + 3A752B890FE6A2DC00091C76 = 3A752B890FE6A2DC00091C76 /* PBXTextBookmark */; + 3A752B8A0FE6A2DC00091C76 = 3A752B8A0FE6A2DC00091C76 /* PBXTextBookmark */; + 3A752B8B0FE6A2DC00091C76 = 3A752B8B0FE6A2DC00091C76 /* PBXTextBookmark */; + 3A752B8C0FE6A2DC00091C76 = 3A752B8C0FE6A2DC00091C76 /* PBXTextBookmark */; + 3A752B8F0FE6A2DC00091C76 = 3A752B8F0FE6A2DC00091C76 /* PBXTextBookmark */; + 3A752B900FE6A2DC00091C76 = 3A752B900FE6A2DC00091C76 /* PBXTextBookmark */; 3A7DF3FD0FC6944300A18013 = 3A7DF3FD0FC6944300A18013 /* PBXTextBookmark */; 3A7DF4610FC7D55D00A18013 = 3A7DF4610FC7D55D00A18013 /* PBXTextBookmark */; 3A7FCEED0FBC046D00EF8097 = 3A7FCEED0FBC046D00EF8097 /* PBXTextBookmark */; @@ -127,6 +127,9 @@ 3A99A7400FB8EC6800B1F47C = 3A99A7400FB8EC6800B1F47C /* PBXTextBookmark */; 3A99A7960FB8F21100B1F47C = 3A99A7960FB8F21100B1F47C /* PBXTextBookmark */; 3A99A7980FB8F21100B1F47C = 3A99A7980FB8F21100B1F47C /* PBXTextBookmark */; + 3AA340F70FE9EC1D004E156E /* PBXTextBookmark */ = 3AA340F70FE9EC1D004E156E /* PBXTextBookmark */; + 3AA340FA0FE9EC1D004E156E /* PBXTextBookmark */ = 3AA340FA0FE9EC1D004E156E /* PBXTextBookmark */; + 3AA340FB0FE9EC1D004E156E /* PBXTextBookmark */ = 3AA340FB0FE9EC1D004E156E /* PBXTextBookmark */; 3AA9B2520FCC9354001346EA = 3AA9B2520FCC9354001346EA /* PBXTextBookmark */; 3AA9B2530FCC9354001346EA = 3AA9B2530FCC9354001346EA /* PBXTextBookmark */; 3ACEFBB10FDA7F2600B47227 = 3ACEFBB10FDA7F2600B47227 /* PBXTextBookmark */; @@ -587,12 +590,6 @@ name = pns.h; path = /Users/drew/Dropbox/Code/pntool/codegen/pns.h; sourceTree = "<absolute>"; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {984, 1750}}"; - sepNavSelRange = "{1737, 59}"; - sepNavVisRange = "{498, 1299}"; - sepNavWindowFrame = "{{-843, 101}, {1027, 575}}"; - }; }; 3A232C6C0FB219C100A5C7C2 /* pns.c */ = { isa = PBXFileReference; @@ -601,12 +598,6 @@ name = pns.c; path = /Users/drew/Dropbox/Code/pntool/codegen/pns.c; sourceTree = "<absolute>"; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1011, 13874}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 1083}"; - sepNavWindowFrame = "{{107, 114}, {1027, 575}}"; - }; }; 3A232C6E0FB219C100A5C7C2 /* matrix.h */ = { isa = PBXFileReference; @@ -615,12 +606,6 @@ name = matrix.h; path = /Users/drew/Dropbox/Code/pntool/codegen/matrix.h; sourceTree = "<absolute>"; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {922, 1764}}"; - sepNavSelRange = "{59, 25}"; - sepNavVisRange = "{0, 1349}"; - sepNavWindowFrame = "{{84, 321}, {981, 639}}"; - }; }; 3A232C6F0FB219C100A5C7C2 /* matrix.c */ = { isa = PBXFileReference; @@ -629,12 +614,6 @@ name = matrix.c; path = /Users/drew/Dropbox/Code/pntool/codegen/matrix.c; sourceTree = "<absolute>"; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1011, 6286}}"; - sepNavSelRange = "{9649, 0}"; - sepNavVisRange = "{9310, 995}"; - sepNavWindowFrame = "{{137, 168}, {1027, 575}}"; - }; }; 3A232C710FB219C100A5C7C2 /* general.h */ = { isa = PBXFileReference; @@ -643,11 +622,6 @@ name = general.h; path = /Users/drew/Dropbox/Code/pntool/codegen/general.h; sourceTree = "<absolute>"; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1011, 1414}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 1521}"; - }; }; 3A232C720FB219C100A5C7C2 /* general.c */ = { isa = PBXFileReference; @@ -656,11 +630,6 @@ name = general.c; path = /Users/drew/Dropbox/Code/pntool/codegen/general.c; sourceTree = "<absolute>"; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1011, 2128}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 978}"; - }; }; 3A232C820FB21E0600A5C7C2 /* codegen.h */ = { uiCtxt = { @@ -814,7 +783,7 @@ ignoreCount = 0; lineNumber = 33; location = codegen; - modificationTime = 266773209.456842; + modificationTime = 266773209.4568419; state = 2; }; 3A3A783D0FC894C600DB2D28 /* supervisorCompler.c:115 */ = { @@ -1242,7 +1211,7 @@ }; 3A99A5B50FB8C45B00B1F47C /* text.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1011, 603}}"; + sepNavIntBoundsRect = "{{0, 0}, {1011, 626}}"; sepNavSelRange = "{0, 0}"; sepNavVisRange = "{0, 643}"; }; @@ -1269,7 +1238,7 @@ ignoreCount = 0; lineNumber = 35; location = codegen; - modificationTime = 266773209.456707; + modificationTime = 266773209.4567069; state = 2; }; 3A99A5FA0FB8D5DF00B1F47C /* PBXTextBookmark */ = { @@ -1293,7 +1262,7 @@ uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {968, 8498}}"; sepNavSelRange = "{10800, 0}"; - sepNavVisRange = "{5679, 1332}"; + sepNavVisRange = "{5610, 1262}"; sepNavWindowFrame = "{{422, -52}, {1027, 1024}}"; }; }; @@ -1354,6 +1323,36 @@ vrLen = 1404; vrLoc = 0; }; + 3AA340F70FE9EC1D004E156E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3A99A5B50FB8C45B00B1F47C /* text.h */; + name = "text.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 643; + vrLoc = 0; + }; + 3AA340FA0FE9EC1D004E156E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */; + name = "supervisor_static_include.h: 439"; + rLen = 0; + rLoc = 10800; + rType = 0; + vrLen = 1262; + vrLoc = 5610; + }; + 3AA340FB0FE9EC1D004E156E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3AEAF9050FB2696400D61E73 /* supervisorCompler.c */; + name = "supervisorCompler.c: 165"; + rLen = 0; + rLoc = 4858; + rType = 0; + vrLen = 1210; + vrLoc = 4359; + }; 3AA9B2520FCC9354001346EA /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3A232C720FB219C100A5C7C2 /* general.c */; @@ -3610,9 +3609,9 @@ }; 3AEAF9050FB2696400D61E73 /* supervisorCompler.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {922, 2842}}"; + sepNavIntBoundsRect = "{{0, 0}, {922, 2828}}"; sepNavSelRange = "{4858, 0}"; - sepNavVisRange = "{4441, 1127}"; + sepNavVisRange = "{4359, 1210}"; sepNavWindowFrame = "{{279, 175}, {981, 639}}"; }; }; Modified: codegen/test_supervisor.sh =================================================================== --- codegen/test_supervisor.sh 2009-06-17 23:58:11 UTC (rev 68) +++ codegen/test_supervisor.sh 2009-06-18 03:44:40 UTC (rev 69) @@ -1,13 +1,17 @@ -cd codegen +cd src xcodebuild -activetarget -activeconfiguration cd .. -cp codegen/includes.txt codegen/build/Debug/ -cd codegen/build/Debug +cp src/includes.txt src/build/Debug/ +cd src/build/Debug ./codegen -mv plant-*.c ../../../ -gcc -o plant-1.out ../../../plant-1.c ../../../pns.c ../../../matrix.c ../../../general.c -DPIPES -gcc -o plant-2.out ../../../plant-2.c ../../../pns.c ../../../matrix.c ../../../general.c -DPIPES -mv supervisor.c ../../../ -cp ../../supervisor_static_include.h ../../../ -gcc -o supervisor ../../../supervisor.c ../../../pns.c ../../../matrix.c ../../../general.c -./supervisor \ No newline at end of file +rm -rf staging +mkdir staging +mv plant-*.c staging/ +cp ../../../../pnheaders/* staging/ +cd staging +gcc -o plant-1.out plant-1.c pns.c matrix.c general.c -DPIPES +gcc -o plant-2.out plant-2.c pns.c matrix.c general.c -DPIPES +mv ../supervisor.c ./ +cp ../../../supervisor_static_include.h ./ +gcc -o supervisor supervisor.c pns.c matrix.c general.c +./supervisor This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mio...@us...> - 2009-06-17 23:59:17
|
Revision: 68 http://pntool.svn.sourceforge.net/pntool/?rev=68&view=rev Author: miordache Date: 2009-06-17 23:58:11 +0000 (Wed, 17 Jun 2009) Log Message: ----------- Updated some pns.h types and added a function to copy pn objects Modified Paths: -------------- pnheaders/pnexample.c pnheaders/pns.c pnheaders/pns.h Modified: pnheaders/pnexample.c =================================================================== --- pnheaders/pnexample.c 2009-06-17 23:32:48 UTC (rev 67) +++ pnheaders/pnexample.c 2009-06-17 23:58:11 UTC (rev 68) @@ -5,7 +5,7 @@ /* Declaring pn objects */ - pns pn_p, pn_s, pn; + pns pn_p, pn_s, pn_s2, pn, pn2; /* Petri nets can be initialized using the incidence matrix */ @@ -101,7 +101,8 @@ /* Flags are set as follows. */ - updatepn(&pn, "unobservable", 0);/*marks transition 0 unobservable*/ + updatepn(&pn, "unobservable nondeterministic", 0, 1); + /* marks transition 0 unobservable and place 1 as nondeterministic */ updatepn(&pn, "live uncontrollable uncontrollable", 0, 0, 2); /* The line above sets the "live" and "uncontrollable" flags of @@ -132,11 +133,16 @@ placed in the pns object, it is not copied. Thus, alist is deallocated when the pns object is deallocated with the function deallocpn. */ + /* To create a copy */ + + pn2 = copypn(&pn); + /* To deallocate a pn object use deallocpn */ deallocpn(&pn_p); deallocpn(&pn_s); deallocpn(&pn); + deallocpn(&pn2); return 0; } Modified: pnheaders/pns.c =================================================================== --- pnheaders/pns.c 2009-06-17 23:32:48 UTC (rev 67) +++ pnheaders/pns.c 2009-06-17 23:58:11 UTC (rev 68) @@ -519,6 +519,74 @@ } + +pns copypn(pns *src) { + pns dst; + arcs *pa; const arcs *pb; + struct placelist *pd; const struct placelist *ps; + int i; + + dst = createpn("pnum tnum mDm mDp", src->pnum, src->tnum, src->out, src->in); + if(src->marking) updatepn(&dst, "m0", src->marking); + if(src->C) updatepn(&dst, "C", src->C); + if(src->place_name) + for(i = 0; i < src->pnum; i++) + if(src->place_name[i]) + updatepn(&dst, "place_name", i, src->place_name[i]); + if(src->segment) + for(i = 0; i < src->pnum; i++) + if(src->segment[i]) + updatepn(&dst, "segment", i, src->segment[i]); + if(src->select) + for(i = 0; i < src->pnum; i++) + if(src->select[i]) + updatepn(&dst, "select", i, src->select[i]); + if(src->trans_name) + for(i = 0; i < src->tnum; i++) + if(src->trans_name[i]) + updatepn(&dst, "trans_name", i, src->trans_name[i]); + if(src->t) { + dst.t = tcalloc(dst.tnum, sizeof(src->t[0])); + for(i = 0; i < src->tnum; i++) + dst.t[i] = src->t[i]; + } + if(src->p) { + dst.p = tcalloc(dst.pnum, sizeof(src->p[0])); + for(i = 0; i < src->pnum; i++) + dst.p[i] = src->p[i]; + } + if(src->arc_list) { /* copy the list of arcs */ + dst.arc_list = tcalloc(dst.tnum, sizeof(*(dst.arc_list))); + for(i = 0; i < src->tnum; i++) { + if(src->arc_list[i]) { + dst.arc_list[i] = tmalloc(sizeof(*(dst.arc_list[0]))); + for(pa = dst.arc_list[i], pb = src->arc_list[i]; pa; pa = pa->next) { + *pa = *pb; + if(pb->condition) { + pa->condition = tmalloc(sizeof(char)*(strlen(pb->condition) + 1)); + strcpy(pa->condition, pb->condition); + } + if(pb->out_places) { /* copy out_places */ + pa->out_places = tmalloc(sizeof(*(pa->out_places))); + for(pd = pa->out_places, ps = pb->out_places; pd; pd = pd->next) { + *pd = *ps; + ps = ps->next; + if(ps) /* else, pd->next is already 0 */ + pd->next = tmalloc(sizeof(*pd)); + } + } + pb = pb->next; + if(pb) + pa->next = tmalloc(sizeof(*pa)); /* else, pa->next already 0 */ + } + } + } + } + + return dst; +} + + void deallocpn(pns *pn) { int i, pnum, tnum; pnum = pn->pnum; Modified: pnheaders/pns.h =================================================================== --- pnheaders/pns.h 2009-06-17 23:32:48 UTC (rev 67) +++ pnheaders/pns.h 2009-06-17 23:58:11 UTC (rev 68) @@ -1,5 +1,5 @@ -/* PNS.H -- Version 2 (05/21/2009) +/* PNS.H -- Version 2.1 (06/17/2009) Please refer to input2.sp describing the specification format for background information on the meaning of the data structures. */ @@ -165,14 +165,17 @@ - mD: matrix type expected. Represents the incidence matrix. - mDm: matrix type expected. Represents the output matrix. - mDp: matrix type expected. Represents the input matrix. + - arcs: int and arcs* types expected, in this order. The integer argument identifies the transition. The arcs* argument is placed in the arcs_list element of the pns object. Therefore, do not deallocate it! All the 'next' pointers in the arcs* argument must be zero, unless some other element follows. + - C: int* type expected. The parameter is the capacity vector. - label: int* type expected. Represents transition labels. - live: int type expected. The parameter identifies the transition that should be live. + - m0: int* type expected. The parameter is the initial marking vector. - nondeterministic: int type expected. The parameter identifies the place that should be marked as nondeterministic. - place_name: int and char*. That is, two arguments are expected in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2009-06-17 23:33:52
|
Revision: 67 http://pntool.svn.sourceforge.net/pntool/?rev=67&view=rev Author: thecodeweasel Date: 2009-06-17 23:32:48 +0000 (Wed, 17 Jun 2009) Log Message: ----------- Modified associative arrays to do additional type checking Setup transition arcs for extern processes Minor optimization Modified Paths: -------------- translator/dataStructures.c translator/dataStructures.h translator/pncompactor.c translator/pncompactor.g translator/pncompactor.h translator/pngenerator.c translator/pngenerator.g translator/pngenerator.h translator/pnscript.g translator/pnscriptLexer.c translator/pnscriptLexer.h translator/pnscriptParser.c translator/pnscriptParser.h Modified: translator/dataStructures.c =================================================================== --- translator/dataStructures.c 2009-06-17 22:46:03 UTC (rev 66) +++ translator/dataStructures.c 2009-06-17 23:32:48 UTC (rev 67) @@ -3,11 +3,11 @@ #include "general.h" //ints are 4 bytes wide, chars are 1 byte wide -static void arrayDelete (ASSOC_ARRAY* array, void* key); -static void* arrayRemove (ASSOC_ARRAY* array, void* key); -static void* arrayGet (ASSOC_ARRAY* array, void* key); -static ANTLR3_INT32 arrayAdd (ASSOC_ARRAY* array, void* key, void* element, void (ANTLR3_CDECL* freeptr)(void*)); -static ANTLR3_UINT32 arraySet (ASSOC_ARRAY* array, ANTLR3_UINT32 key, void* element, void (ANTLR3_CDECL* freeptr)(void*)); +static void arrayDelete (ASSOC_ARRAY* array, char* key); +static void* arrayRemove (ASSOC_ARRAY* array, char* key); +static void* arrayGet (ASSOC_ARRAY* array, char* key); +static ANTLR3_INT32 arrayAdd (ASSOC_ARRAY* array, char* key, void* element, void (ANTLR3_CDECL* freeptr)(void*)); +static ANTLR3_UINT32 arraySet (ASSOC_ARRAY* array, char* key, void* element, void (ANTLR3_CDECL* freeptr)(void*)); static void arrayFree (ASSOC_ARRAY* array); static ANTLR3_UINT32 arraySize (ASSOC_ARRAY* array); static void* arrayIter (ASSOC_ARRAY* array, int i); @@ -35,52 +35,48 @@ return ret; } -void arrayDelete(ASSOC_ARRAY* array, void* key) { +void arrayDelete(ASSOC_ARRAY* array, char* key) { int intKey; - intKey = *((int*) array->table->get(array->table, (char*) key)); + intKey = *((int*) array->table->get(array->table, key)); array->list->del(array->list, intKey); - array->table->del(array->table, (char*) key); + array->table->del(array->table, key); } -void* arrayRemove(ASSOC_ARRAY* array, void* key) { +void* arrayRemove(ASSOC_ARRAY* array, char* key) { void* ret; int intKey; - intKey = *((int*) array->table->get(array->table, (char*) key)); + intKey = *((int*) array->table->get(array->table, key)); array->list->del(array->list, intKey); - ret = array->table->remove(array->table, (char*) key); + ret = array->table->remove(array->table, key); return ret; } -void* arrayGet(ASSOC_ARRAY* array, void* key) { - return array->table->get(array->table, (char*) key); +void* arrayGet(ASSOC_ARRAY* array, char* key) { + return array->table->get(array->table, key); } -ANTLR3_INT32 arrayAdd(ASSOC_ARRAY* array, void* key, void* element, void (ANTLR3_CDECL* freeptr)(void*)) { +ANTLR3_INT32 arrayAdd(ASSOC_ARRAY* array, char* key, void* element, void (ANTLR3_CDECL* freeptr)(void*)) { ANTLR3_INT32 ret; - char* strKey; - strKey = (char*) key; //ALWAYS free from the hash table - array->table->put(array->table, strKey, element, freeptr); - array->list->add(array->list, strKey, NULL); + array->table->put(array->table, key, element, freeptr); + array->list->add(array->list, key, NULL); return ret; } -ANTLR3_UINT32 arraySet(ASSOC_ARRAY* array, ANTLR3_UINT32 key, void* element, void (ANTLR3_CDECL* freeptr)(void*)) { +ANTLR3_UINT32 arraySet(ASSOC_ARRAY* array, char* key, void* element, void (ANTLR3_CDECL* freeptr)(void*)) { ANTLR3_UINT32 ret; - char* strKey; static int intKey; int i; - strKey = (char*) key; for(i = 0; i < array->list->size(array->list); i++) { - if(strcmp((char*) array->list->get(array->list, i), strKey)) { + if(strcmp((char*) array->list->get(array->list, i), key)) { intKey = i; break; } } - array->list->set(array->list, intKey, strKey, NULL, false); - ret = array->table->put(array->table, strKey, element, freeptr); + array->list->set(array->list, intKey, key, NULL, false); + ret = array->table->put(array->table, key, element, freeptr); return ret; } Modified: translator/dataStructures.h =================================================================== --- translator/dataStructures.h 2009-06-17 22:46:03 UTC (rev 66) +++ translator/dataStructures.h 2009-06-17 23:32:48 UTC (rev 67) @@ -17,15 +17,15 @@ void (*free) (struct ASSOC_ARRAY_struct* array); //ints are 4 bytes wide, chars are 1 byte wide - void (*del) (struct ASSOC_ARRAY_struct* array, void* key); - void* (*remove) (struct ASSOC_ARRAY_struct* array, void* key); - void* (*get) (struct ASSOC_ARRAY_struct* array, void* key); - ANTLR3_INT32 (*add) (struct ASSOC_ARRAY_struct* array, void* key, void* element, void (ANTLR3_CDECL* freeptr)(void*)); - ANTLR3_UINT32 (*set) (struct ASSOC_ARRAY_struct* array, ANTLR3_UINT32 key, void* element, void (ANTLR3_CDECL* freeptr)(void*)); + void (*del) (struct ASSOC_ARRAY_struct* array, char* key); + void* (*remove) (struct ASSOC_ARRAY_struct* array, char* key); + void* (*get) (struct ASSOC_ARRAY_struct* array, char* key); + ANTLR3_INT32 (*add) (struct ASSOC_ARRAY_struct* array, char* key, void* element, void (ANTLR3_CDECL* freeptr)(void*)); + ANTLR3_UINT32 (*set) (struct ASSOC_ARRAY_struct* array, char* key, void* element, void (ANTLR3_CDECL* freeptr)(void*)); //based off the vector size to ensure iterating never goes awry ANTLR3_UINT32 (*size) (struct ASSOC_ARRAY_struct* array); void* (*iter) (struct ASSOC_ARRAY_struct* array, int i); - void* (*iterKeys) (struct ASSOC_ARRAY_struct* array, int i); + char* (*iterKeys) (struct ASSOC_ARRAY_struct* array, int i); } ASSOC_ARRAY; #endif \ No newline at end of file Modified: translator/pncompactor.c =================================================================== --- translator/pncompactor.c 2009-06-17 22:46:03 UTC (rev 66) +++ translator/pncompactor.c 2009-06-17 23:32:48 UTC (rev 67) @@ -2,7 +2,7 @@ * This C source file was generated by $ANTLR version 3.1.2 * * - From the grammar source file : /Users/bion/projects/iordache/translator/pncompactor.g - * - On : 2009-06-16 22:23:57 + * - On : 2009-06-17 18:32:07 * - for the tree parser : pncompactorTreeParser * * Editing it, at least manually, is not wise. * @@ -344,9 +344,9 @@ // // If the user supplied the scope entries with a free function,then call it first // - if (SCOPE_TOP(constraints)->free != NULL) + if (SCOPE_TOP(constraints)>free != NULL) { - SCOPE_TOP(constraints)->free(SCOPE_TOP(constraints)); + SCOPE_TOP(constraints)>->free(SCOPE_TOP(constraints)); } // Now we decrement the scope's upper limit bound. We do not actually pop the scope as @@ -387,12 +387,12 @@ static pncompactor_group_elements_return group_elements (ppncompactor ctx); static pncompactor_numbered_ID_return numbered_ID (ppncompactor ctx); static ANTLR3_BOOLEAN synpred2_pncompactor (ppncompactor ctx); -static ANTLR3_BOOLEAN synpred27_pncompactor (ppncompactor ctx); +static ANTLR3_BOOLEAN synpred26_pncompactor (ppncompactor ctx); +static ANTLR3_BOOLEAN synpred28_pncompactor (ppncompactor ctx); static ANTLR3_BOOLEAN synpred29_pncompactor (ppncompactor ctx); static ANTLR3_BOOLEAN synpred30_pncompactor (ppncompactor ctx); static ANTLR3_BOOLEAN synpred31_pncompactor (ppncompactor ctx); static ANTLR3_BOOLEAN synpred32_pncompactor (ppncompactor ctx); -static ANTLR3_BOOLEAN synpred33_pncompactor (ppncompactor ctx); static void pncompactorFree(ppncompactor ctx); /* For use in tree output where we are accumulating rule labels via label += ruleRef * we need a function that knows how to free a return scope when the list is destroyed. @@ -490,12 +490,12 @@ ctx->group_elements = group_elements; ctx->numbered_ID = numbered_ID; ctx->synpred2_pncompactor = synpred2_pncompactor; - ctx->synpred27_pncompactor = synpred27_pncompactor; + ctx->synpred26_pncompactor = synpred26_pncompactor; + ctx->synpred28_pncompactor = synpred28_pncompactor; ctx->synpred29_pncompactor = synpred29_pncompactor; ctx->synpred30_pncompactor = synpred30_pncompactor; ctx->synpred31_pncompactor = synpred31_pncompactor; ctx->synpred32_pncompactor = synpred32_pncompactor; - ctx->synpred33_pncompactor = synpred33_pncompactor; ctx->free = pncompactorFree; ctx->getGrammarFileName = getGrammarFileName; @@ -595,273 +595,267 @@ /** Bitset defining follow set for error recovery in rule state: FOLLOW_trans_def_in_trans_defs140 */ static ANTLR3_BITWORD FOLLOW_trans_def_in_trans_defs140_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; static ANTLR3_BITSET_LIST FOLLOW_trans_def_in_trans_defs140 = { FOLLOW_trans_def_in_trans_defs140_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_TO_in_extern_trans_def150 */ -static ANTLR3_BITWORD FOLLOW_TO_in_extern_trans_def150_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_TO_in_extern_trans_def150 = { FOLLOW_TO_in_extern_trans_def150_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_extern_trans_def152 */ -static ANTLR3_BITWORD FOLLOW_ID_in_extern_trans_def152_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_extern_trans_def152 = { FOLLOW_ID_in_extern_trans_def152_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_FROM_in_extern_trans_def160 */ -static ANTLR3_BITWORD FOLLOW_FROM_in_extern_trans_def160_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_FROM_in_extern_trans_def160 = { FOLLOW_FROM_in_extern_trans_def160_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_extern_trans_def162 */ -static ANTLR3_BITWORD FOLLOW_ID_in_extern_trans_def162_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_extern_trans_def162 = { FOLLOW_ID_in_extern_trans_def162_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_trans_def174 */ -static ANTLR3_BITWORD FOLLOW_ID_in_trans_def174_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_trans_def174 = { FOLLOW_ID_in_trans_def174_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_CODE_BLOCK_in_trans_def176 */ -static ANTLR3_BITWORD FOLLOW_CODE_BLOCK_in_trans_def176_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_CODE_BLOCK_in_trans_def176 = { FOLLOW_CODE_BLOCK_in_trans_def176_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_trans_def183 */ -static ANTLR3_BITWORD FOLLOW_ID_in_trans_def183_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_trans_def183 = { FOLLOW_ID_in_trans_def183_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_trans_def185 */ -static ANTLR3_BITWORD FOLLOW_ID_in_trans_def185_bits[] = { ANTLR3_UINT64_LIT(0x0000000000001208) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_trans_def185 = { FOLLOW_ID_in_trans_def185_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_CODE_BLOCK_in_trans_def188 */ -static ANTLR3_BITWORD FOLLOW_CODE_BLOCK_in_trans_def188_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_CODE_BLOCK_in_trans_def188 = { FOLLOW_CODE_BLOCK_in_trans_def188_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_SELECT_DEF_in_select_functions199 */ -static ANTLR3_BITWORD FOLLOW_SELECT_DEF_in_select_functions199_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_SELECT_DEF_in_select_functions199 = { FOLLOW_SELECT_DEF_in_select_functions199_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_select_functions201 */ -static ANTLR3_BITWORD FOLLOW_ID_in_select_functions201_bits[] = { ANTLR3_UINT64_LIT(0x0000000000001000) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_select_functions201 = { FOLLOW_ID_in_select_functions201_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_CODE_BLOCK_in_select_functions203 */ -static ANTLR3_BITWORD FOLLOW_CODE_BLOCK_in_select_functions203_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_CODE_BLOCK_in_select_functions203 = { FOLLOW_CODE_BLOCK_in_select_functions203_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_44_in_nondeterm214 */ -static ANTLR3_BITWORD FOLLOW_44_in_nondeterm214_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_44_in_nondeterm214 = { FOLLOW_44_in_nondeterm214_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_nondeterm216 */ -static ANTLR3_BITWORD FOLLOW_ID_in_nondeterm216_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_nondeterm216 = { FOLLOW_ID_in_nondeterm216_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_proc_init_in_proc_instantiations228 */ -static ANTLR3_BITWORD FOLLOW_proc_init_in_proc_instantiations228_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_proc_init_in_proc_instantiations228 = { FOLLOW_proc_init_in_proc_instantiations228_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_sync_def_in_proc_instantiations232 */ -static ANTLR3_BITWORD FOLLOW_sync_def_in_proc_instantiations232_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_sync_def_in_proc_instantiations232 = { FOLLOW_sync_def_in_proc_instantiations232_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_proc_start_in_proc_instantiations236 */ -static ANTLR3_BITWORD FOLLOW_proc_start_in_proc_instantiations236_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_proc_start_in_proc_instantiations236 = { FOLLOW_proc_start_in_proc_instantiations236_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_proc_init246 */ -static ANTLR3_BITWORD FOLLOW_ID_in_proc_init246_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_proc_init246 = { FOLLOW_ID_in_proc_init246_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_proc_init248 */ -static ANTLR3_BITWORD FOLLOW_ID_in_proc_init248_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000200) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_proc_init248 = { FOLLOW_ID_in_proc_init248_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_numbered_ID_in_proc_init250 */ -static ANTLR3_BITWORD FOLLOW_numbered_ID_in_proc_init250_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; -static ANTLR3_BITSET_LIST FOLLOW_numbered_ID_in_proc_init250 = { FOLLOW_numbered_ID_in_proc_init250_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_SYNC_TOK_in_sync_def262 */ -static ANTLR3_BITWORD FOLLOW_SYNC_TOK_in_sync_def262_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_SYNC_TOK_in_sync_def262 = { FOLLOW_SYNC_TOK_in_sync_def262_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_sync_def264 */ -static ANTLR3_BITWORD FOLLOW_group_elements_in_sync_def264_bits[] = { ANTLR3_UINT64_LIT(0x0000000000080208) }; -static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_sync_def264 = { FOLLOW_group_elements_in_sync_def264_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_START_in_proc_start276 */ -static ANTLR3_BITWORD FOLLOW_START_in_proc_start276_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_START_in_proc_start276 = { FOLLOW_START_in_proc_start276_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_proc_start278 */ -static ANTLR3_BITWORD FOLLOW_ID_in_proc_start278_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_proc_start278 = { FOLLOW_ID_in_proc_start278_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_constraint_block_in_constraints295 */ -static ANTLR3_BITWORD FOLLOW_constraint_block_in_constraints295_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_constraint_block_in_constraints295 = { FOLLOW_constraint_block_in_constraints295_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_constraints300 */ -static ANTLR3_BITWORD FOLLOW_eq_in_constraints300_bits[] = { ANTLR3_UINT64_LIT(0x00000001BE8A0208) }; -static ANTLR3_BITSET_LIST FOLLOW_eq_in_constraints300 = { FOLLOW_eq_in_constraints300_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_live_def_in_constraints306 */ -static ANTLR3_BITWORD FOLLOW_live_def_in_constraints306_bits[] = { ANTLR3_UINT64_LIT(0x0000000180000008) }; -static ANTLR3_BITSET_LIST FOLLOW_live_def_in_constraints306 = { FOLLOW_live_def_in_constraints306_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_uncontrol_in_constraints309 */ -static ANTLR3_BITWORD FOLLOW_uncontrol_in_constraints309_bits[] = { ANTLR3_UINT64_LIT(0x0000000100000008) }; -static ANTLR3_BITSET_LIST FOLLOW_uncontrol_in_constraints309 = { FOLLOW_uncontrol_in_constraints309_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_unobserve_in_constraints312 */ -static ANTLR3_BITWORD FOLLOW_unobserve_in_constraints312_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_unobserve_in_constraints312 = { FOLLOW_unobserve_in_constraints312_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_constraint_block322 */ -static ANTLR3_BITWORD FOLLOW_ID_in_constraint_block322_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_constraint_block322 = { FOLLOW_ID_in_constraint_block322_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_relationalExpression_in_eq331 */ -static ANTLR3_BITWORD FOLLOW_relationalExpression_in_eq331_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_relationalExpression_in_eq331 = { FOLLOW_relationalExpression_in_eq331_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_EQS_OP_in_eq337 */ -static ANTLR3_BITWORD FOLLOW_EQS_OP_in_eq337_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_EQS_OP_in_eq337 = { FOLLOW_EQS_OP_in_eq337_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_eq339 */ -static ANTLR3_BITWORD FOLLOW_eq_in_eq339_bits[] = { ANTLR3_UINT64_LIT(0x00000001BE8A0208) }; -static ANTLR3_BITSET_LIST FOLLOW_eq_in_eq339 = { FOLLOW_eq_in_eq339_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_eq341 */ -static ANTLR3_BITWORD FOLLOW_eq_in_eq341_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_eq_in_eq341 = { FOLLOW_eq_in_eq341_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_relationalExpression357 */ -static ANTLR3_BITWORD FOLLOW_additiveExpression_in_relationalExpression357_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_relationalExpression357 = { FOLLOW_additiveExpression_in_relationalExpression357_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_EQ_OP_in_relationalExpression366 */ -static ANTLR3_BITWORD FOLLOW_EQ_OP_in_relationalExpression366_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_EQ_OP_in_relationalExpression366 = { FOLLOW_EQ_OP_in_relationalExpression366_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_set_in_extern_trans_def150 */ +static ANTLR3_BITWORD FOLLOW_set_in_extern_trans_def150_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_set_in_extern_trans_def150 = { FOLLOW_set_in_extern_trans_def150_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_extern_trans_def158 */ +static ANTLR3_BITWORD FOLLOW_ID_in_extern_trans_def158_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_extern_trans_def158 = { FOLLOW_ID_in_extern_trans_def158_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_trans_def170 */ +static ANTLR3_BITWORD FOLLOW_ID_in_trans_def170_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_trans_def170 = { FOLLOW_ID_in_trans_def170_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_CODE_BLOCK_in_trans_def172 */ +static ANTLR3_BITWORD FOLLOW_CODE_BLOCK_in_trans_def172_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_CODE_BLOCK_in_trans_def172 = { FOLLOW_CODE_BLOCK_in_trans_def172_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_trans_def179 */ +static ANTLR3_BITWORD FOLLOW_ID_in_trans_def179_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_trans_def179 = { FOLLOW_ID_in_trans_def179_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_trans_def181 */ +static ANTLR3_BITWORD FOLLOW_ID_in_trans_def181_bits[] = { ANTLR3_UINT64_LIT(0x0000000000001208) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_trans_def181 = { FOLLOW_ID_in_trans_def181_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_CODE_BLOCK_in_trans_def184 */ +static ANTLR3_BITWORD FOLLOW_CODE_BLOCK_in_trans_def184_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_CODE_BLOCK_in_trans_def184 = { FOLLOW_CODE_BLOCK_in_trans_def184_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_SELECT_DEF_in_select_functions195 */ +static ANTLR3_BITWORD FOLLOW_SELECT_DEF_in_select_functions195_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_SELECT_DEF_in_select_functions195 = { FOLLOW_SELECT_DEF_in_select_functions195_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_select_functions197 */ +static ANTLR3_BITWORD FOLLOW_ID_in_select_functions197_bits[] = { ANTLR3_UINT64_LIT(0x0000000000001000) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_select_functions197 = { FOLLOW_ID_in_select_functions197_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_CODE_BLOCK_in_select_functions199 */ +static ANTLR3_BITWORD FOLLOW_CODE_BLOCK_in_select_functions199_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_CODE_BLOCK_in_select_functions199 = { FOLLOW_CODE_BLOCK_in_select_functions199_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_44_in_nondeterm210 */ +static ANTLR3_BITWORD FOLLOW_44_in_nondeterm210_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_44_in_nondeterm210 = { FOLLOW_44_in_nondeterm210_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_nondeterm212 */ +static ANTLR3_BITWORD FOLLOW_ID_in_nondeterm212_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_nondeterm212 = { FOLLOW_ID_in_nondeterm212_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_proc_init_in_proc_instantiations224 */ +static ANTLR3_BITWORD FOLLOW_proc_init_in_proc_instantiations224_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_proc_init_in_proc_instantiations224 = { FOLLOW_proc_init_in_proc_instantiations224_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_sync_def_in_proc_instantiations228 */ +static ANTLR3_BITWORD FOLLOW_sync_def_in_proc_instantiations228_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_sync_def_in_proc_instantiations228 = { FOLLOW_sync_def_in_proc_instantiations228_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_proc_start_in_proc_instantiations232 */ +static ANTLR3_BITWORD FOLLOW_proc_start_in_proc_instantiations232_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_proc_start_in_proc_instantiations232 = { FOLLOW_proc_start_in_proc_instantiations232_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_proc_init242 */ +static ANTLR3_BITWORD FOLLOW_ID_in_proc_init242_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_proc_init242 = { FOLLOW_ID_in_proc_init242_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_proc_init244 */ +static ANTLR3_BITWORD FOLLOW_ID_in_proc_init244_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000200) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_proc_init244 = { FOLLOW_ID_in_proc_init244_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_numbered_ID_in_proc_init246 */ +static ANTLR3_BITWORD FOLLOW_numbered_ID_in_proc_init246_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; +static ANTLR3_BITSET_LIST FOLLOW_numbered_ID_in_proc_init246 = { FOLLOW_numbered_ID_in_proc_init246_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_SYNC_TOK_in_sync_def258 */ +static ANTLR3_BITWORD FOLLOW_SYNC_TOK_in_sync_def258_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_SYNC_TOK_in_sync_def258 = { FOLLOW_SYNC_TOK_in_sync_def258_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_sync_def260 */ +static ANTLR3_BITWORD FOLLOW_group_elements_in_sync_def260_bits[] = { ANTLR3_UINT64_LIT(0x0000000000080208) }; +static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_sync_def260 = { FOLLOW_group_elements_in_sync_def260_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_START_in_proc_start272 */ +static ANTLR3_BITWORD FOLLOW_START_in_proc_start272_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_START_in_proc_start272 = { FOLLOW_START_in_proc_start272_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_proc_start274 */ +static ANTLR3_BITWORD FOLLOW_ID_in_proc_start274_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_proc_start274 = { FOLLOW_ID_in_proc_start274_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_constraint_block_in_constraints291 */ +static ANTLR3_BITWORD FOLLOW_constraint_block_in_constraints291_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_constraint_block_in_constraints291 = { FOLLOW_constraint_block_in_constraints291_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_constraints296 */ +static ANTLR3_BITWORD FOLLOW_eq_in_constraints296_bits[] = { ANTLR3_UINT64_LIT(0x00000001BE8A0208) }; +static ANTLR3_BITSET_LIST FOLLOW_eq_in_constraints296 = { FOLLOW_eq_in_constraints296_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_live_def_in_constraints302 */ +static ANTLR3_BITWORD FOLLOW_live_def_in_constraints302_bits[] = { ANTLR3_UINT64_LIT(0x0000000180000008) }; +static ANTLR3_BITSET_LIST FOLLOW_live_def_in_constraints302 = { FOLLOW_live_def_in_constraints302_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_uncontrol_in_constraints305 */ +static ANTLR3_BITWORD FOLLOW_uncontrol_in_constraints305_bits[] = { ANTLR3_UINT64_LIT(0x0000000100000008) }; +static ANTLR3_BITSET_LIST FOLLOW_uncontrol_in_constraints305 = { FOLLOW_uncontrol_in_constraints305_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_unobserve_in_constraints308 */ +static ANTLR3_BITWORD FOLLOW_unobserve_in_constraints308_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_unobserve_in_constraints308 = { FOLLOW_unobserve_in_constraints308_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_constraint_block318 */ +static ANTLR3_BITWORD FOLLOW_ID_in_constraint_block318_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_constraint_block318 = { FOLLOW_ID_in_constraint_block318_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_relationalExpression_in_eq327 */ +static ANTLR3_BITWORD FOLLOW_relationalExpression_in_eq327_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_relationalExpression_in_eq327 = { FOLLOW_relationalExpression_in_eq327_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_EQS_OP_in_eq333 */ +static ANTLR3_BITWORD FOLLOW_EQS_OP_in_eq333_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_EQS_OP_in_eq333 = { FOLLOW_EQS_OP_in_eq333_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_eq335 */ +static ANTLR3_BITWORD FOLLOW_eq_in_eq335_bits[] = { ANTLR3_UINT64_LIT(0x00000001BE8A0208) }; +static ANTLR3_BITSET_LIST FOLLOW_eq_in_eq335 = { FOLLOW_eq_in_eq335_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_eq337 */ +static ANTLR3_BITWORD FOLLOW_eq_in_eq337_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_eq_in_eq337 = { FOLLOW_eq_in_eq337_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_relationalExpression353 */ +static ANTLR3_BITWORD FOLLOW_additiveExpression_in_relationalExpression353_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_relationalExpression353 = { FOLLOW_additiveExpression_in_relationalExpression353_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_EQ_OP_in_relationalExpression362 */ +static ANTLR3_BITWORD FOLLOW_EQ_OP_in_relationalExpression362_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_EQ_OP_in_relationalExpression362 = { FOLLOW_EQ_OP_in_relationalExpression362_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_relationalExpression_in_relationalExpression364 */ +static ANTLR3_BITWORD FOLLOW_relationalExpression_in_relationalExpression364_bits[] = { ANTLR3_UINT64_LIT(0x000000001C8A0208) }; +static ANTLR3_BITSET_LIST FOLLOW_relationalExpression_in_relationalExpression364 = { FOLLOW_relationalExpression_in_relationalExpression364_bits, 1 }; /** Bitset defining follow set for error recovery in rule state: FOLLOW_relationalExpression_in_relationalExpression368 */ -static ANTLR3_BITWORD FOLLOW_relationalExpression_in_relationalExpression368_bits[] = { ANTLR3_UINT64_LIT(0x000000001C8A0208) }; +static ANTLR3_BITWORD FOLLOW_relationalExpression_in_relationalExpression368_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; static ANTLR3_BITSET_LIST FOLLOW_relationalExpression_in_relationalExpression368 = { FOLLOW_relationalExpression_in_relationalExpression368_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_relationalExpression_in_relationalExpression372 */ -static ANTLR3_BITWORD FOLLOW_relationalExpression_in_relationalExpression372_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_relationalExpression_in_relationalExpression372 = { FOLLOW_relationalExpression_in_relationalExpression372_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_primary_in_additiveExpression393 */ -static ANTLR3_BITWORD FOLLOW_primary_in_additiveExpression393_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_primary_in_additiveExpression393 = { FOLLOW_primary_in_additiveExpression393_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_PLUS_in_additiveExpression403 */ -static ANTLR3_BITWORD FOLLOW_PLUS_in_additiveExpression403_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_PLUS_in_additiveExpression403 = { FOLLOW_PLUS_in_additiveExpression403_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression407 */ -static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression407_bits[] = { ANTLR3_UINT64_LIT(0x00000000188A0208) }; -static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression407 = { FOLLOW_additiveExpression_in_additiveExpression407_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression424 */ -static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression424_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression424 = { FOLLOW_additiveExpression_in_additiveExpression424_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_MINUS_in_additiveExpression474 */ -static ANTLR3_BITWORD FOLLOW_MINUS_in_additiveExpression474_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_MINUS_in_additiveExpression474 = { FOLLOW_MINUS_in_additiveExpression474_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression478 */ -static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression478_bits[] = { ANTLR3_UINT64_LIT(0x00000000188A0208) }; -static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression478 = { FOLLOW_additiveExpression_in_additiveExpression478_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression494 */ -static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression494_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression494 = { FOLLOW_additiveExpression_in_additiveExpression494_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_MINUS_in_primary555 */ -static ANTLR3_BITWORD FOLLOW_MINUS_in_primary555_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_MINUS_in_primary555 = { FOLLOW_MINUS_in_primary555_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_primary559 */ -static ANTLR3_BITWORD FOLLOW_eq_in_primary559_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_eq_in_primary559 = { FOLLOW_eq_in_primary559_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_primary576 */ -static ANTLR3_BITWORD FOLLOW_ID_in_primary576_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_primary576 = { FOLLOW_ID_in_primary576_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_primary623 */ -static ANTLR3_BITWORD FOLLOW_group_elements_in_primary623_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_primary623 = { FOLLOW_group_elements_in_primary623_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_number_in_primary664 */ -static ANTLR3_BITWORD FOLLOW_number_in_primary664_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_number_in_primary664 = { FOLLOW_number_in_primary664_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_MULT_in_primary673 */ -static ANTLR3_BITWORD FOLLOW_MULT_in_primary673_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_MULT_in_primary673 = { FOLLOW_MULT_in_primary673_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_number_in_primary675 */ -static ANTLR3_BITWORD FOLLOW_number_in_primary675_bits[] = { ANTLR3_UINT64_LIT(0x00000000108A0208) }; -static ANTLR3_BITSET_LIST FOLLOW_number_in_primary675 = { FOLLOW_number_in_primary675_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_primary_in_primary677 */ -static ANTLR3_BITWORD FOLLOW_primary_in_primary677_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_primary_in_primary677 = { FOLLOW_primary_in_primary677_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_MULT_in_primary712 */ -static ANTLR3_BITWORD FOLLOW_MULT_in_primary712_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_MULT_in_primary712 = { FOLLOW_MULT_in_primary712_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_number_in_primary714 */ -static ANTLR3_BITWORD FOLLOW_number_in_primary714_bits[] = { ANTLR3_UINT64_LIT(0x00000001BE8A0208) }; -static ANTLR3_BITSET_LIST FOLLOW_number_in_primary714 = { FOLLOW_number_in_primary714_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_primary718 */ -static ANTLR3_BITWORD FOLLOW_eq_in_primary718_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_eq_in_primary718 = { FOLLOW_eq_in_primary718_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_LIVE_in_live_def742 */ -static ANTLR3_BITWORD FOLLOW_LIVE_in_live_def742_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_LIVE_in_live_def742 = { FOLLOW_LIVE_in_live_def742_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ALL_in_live_def744 */ -static ANTLR3_BITWORD FOLLOW_ALL_in_live_def744_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; -static ANTLR3_BITSET_LIST FOLLOW_ALL_in_live_def744 = { FOLLOW_ALL_in_live_def744_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_live_def746 */ -static ANTLR3_BITWORD FOLLOW_ID_in_live_def746_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_live_def746 = { FOLLOW_ID_in_live_def746_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_LIVE_in_live_def754 */ -static ANTLR3_BITWORD FOLLOW_LIVE_in_live_def754_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_LIVE_in_live_def754 = { FOLLOW_LIVE_in_live_def754_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_live_def756 */ -static ANTLR3_BITWORD FOLLOW_ID_in_live_def756_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_live_def756 = { FOLLOW_ID_in_live_def756_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_UNCONTROL_in_uncontrol768 */ -static ANTLR3_BITWORD FOLLOW_UNCONTROL_in_uncontrol768_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_UNCONTROL_in_uncontrol768 = { FOLLOW_UNCONTROL_in_uncontrol768_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_uncontrol770 */ -static ANTLR3_BITWORD FOLLOW_ID_in_uncontrol770_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_uncontrol770 = { FOLLOW_ID_in_uncontrol770_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_UNOBSERVE_in_unobserve782 */ -static ANTLR3_BITWORD FOLLOW_UNOBSERVE_in_unobserve782_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_UNOBSERVE_in_unobserve782 = { FOLLOW_UNOBSERVE_in_unobserve782_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_unobserve784 */ -static ANTLR3_BITWORD FOLLOW_ID_in_unobserve784_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_unobserve784 = { FOLLOW_ID_in_unobserve784_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_print_in_other_commands796 */ -static ANTLR3_BITWORD FOLLOW_print_in_other_commands796_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_print_in_other_commands796 = { FOLLOW_print_in_other_commands796_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_PRINT_in_print806 */ -static ANTLR3_BITWORD FOLLOW_PRINT_in_print806_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_PRINT_in_print806 = { FOLLOW_PRINT_in_print806_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_print808 */ -static ANTLR3_BITWORD FOLLOW_ID_in_print808_bits[] = { ANTLR3_UINT64_LIT(0x0000000000080208) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_print808 = { FOLLOW_ID_in_print808_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_print810 */ -static ANTLR3_BITWORD FOLLOW_group_elements_in_print810_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_print810 = { FOLLOW_group_elements_in_print810_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_INT_in_number829 */ -static ANTLR3_BITWORD FOLLOW_INT_in_number829_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_INT_in_number829 = { FOLLOW_INT_in_number829_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_MINUS_in_number842 */ -static ANTLR3_BITWORD FOLLOW_MINUS_in_number842_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_MINUS_in_number842 = { FOLLOW_MINUS_in_number842_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_INT_in_number844 */ -static ANTLR3_BITWORD FOLLOW_INT_in_number844_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_INT_in_number844 = { FOLLOW_INT_in_number844_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_group_elements861 */ -static ANTLR3_BITWORD FOLLOW_ID_in_group_elements861_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_group_elements861 = { FOLLOW_ID_in_group_elements861_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_DOT_in_group_elements867 */ -static ANTLR3_BITWORD FOLLOW_DOT_in_group_elements867_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_DOT_in_group_elements867 = { FOLLOW_DOT_in_group_elements867_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_group_elements869 */ -static ANTLR3_BITWORD FOLLOW_group_elements_in_group_elements869_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000200) }; -static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_group_elements869 = { FOLLOW_group_elements_in_group_elements869_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_group_elements871 */ -static ANTLR3_BITWORD FOLLOW_ID_in_group_elements871_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_group_elements871 = { FOLLOW_ID_in_group_elements871_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_numbered_ID881 */ -static ANTLR3_BITWORD FOLLOW_ID_in_numbered_ID881_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_numbered_ID881 = { FOLLOW_ID_in_numbered_ID881_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_numbered_ID887 */ -static ANTLR3_BITWORD FOLLOW_ID_in_numbered_ID887_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_numbered_ID887 = { FOLLOW_ID_in_numbered_ID887_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_INT_in_numbered_ID889 */ -static ANTLR3_BITWORD FOLLOW_INT_in_numbered_ID889_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_INT_in_numbered_ID889 = { FOLLOW_INT_in_numbered_ID889_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_primary_in_additiveExpression389 */ +static ANTLR3_BITWORD FOLLOW_primary_in_additiveExpression389_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_primary_in_additiveExpression389 = { FOLLOW_primary_in_additiveExpression389_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_PLUS_in_additiveExpression399 */ +static ANTLR3_BITWORD FOLLOW_PLUS_in_additiveExpression399_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_PLUS_in_additiveExpression399 = { FOLLOW_PLUS_in_additiveExpression399_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression403 */ +static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression403_bits[] = { ANTLR3_UINT64_LIT(0x00000000188A0208) }; +static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression403 = { FOLLOW_additiveExpression_in_additiveExpression403_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression420 */ +static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression420_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression420 = { FOLLOW_additiveExpression_in_additiveExpression420_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_MINUS_in_additiveExpression470 */ +static ANTLR3_BITWORD FOLLOW_MINUS_in_additiveExpression470_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_MINUS_in_additiveExpression470 = { FOLLOW_MINUS_in_additiveExpression470_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression474 */ +static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression474_bits[] = { ANTLR3_UINT64_LIT(0x00000000188A0208) }; +static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression474 = { FOLLOW_additiveExpression_in_additiveExpression474_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression490 */ +static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression490_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression490 = { FOLLOW_additiveExpression_in_additiveExpression490_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_MINUS_in_primary551 */ +static ANTLR3_BITWORD FOLLOW_MINUS_in_primary551_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_MINUS_in_primary551 = { FOLLOW_MINUS_in_primary551_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_primary555 */ +static ANTLR3_BITWORD FOLLOW_eq_in_primary555_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_eq_in_primary555 = { FOLLOW_eq_in_primary555_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_primary572 */ +static ANTLR3_BITWORD FOLLOW_ID_in_primary572_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_primary572 = { FOLLOW_ID_in_primary572_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_primary619 */ +static ANTLR3_BITWORD FOLLOW_group_elements_in_primary619_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_primary619 = { FOLLOW_group_elements_in_primary619_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_number_in_primary660 */ +static ANTLR3_BITWORD FOLLOW_number_in_primary660_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_number_in_primary660 = { FOLLOW_number_in_primary660_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_MULT_in_primary669 */ +static ANTLR3_BITWORD FOLLOW_MULT_in_primary669_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_MULT_in_primary669 = { FOLLOW_MULT_in_primary669_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_number_in_primary671 */ +static ANTLR3_BITWORD FOLLOW_number_in_primary671_bits[] = { ANTLR3_UINT64_LIT(0x00000000108A0208) }; +static ANTLR3_BITSET_LIST FOLLOW_number_in_primary671 = { FOLLOW_number_in_primary671_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_primary_in_primary673 */ +static ANTLR3_BITWORD FOLLOW_primary_in_primary673_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_primary_in_primary673 = { FOLLOW_primary_in_primary673_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_MULT_in_primary708 */ +static ANTLR3_BITWORD FOLLOW_MULT_in_primary708_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_MULT_in_primary708 = { FOLLOW_MULT_in_primary708_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_number_in_primary710 */ +static ANTLR3_BITWORD FOLLOW_number_in_primary710_bits[] = { ANTLR3_UINT64_LIT(0x00000001BE8A0208) }; +static ANTLR3_BITSET_LIST FOLLOW_number_in_primary710 = { FOLLOW_number_in_primary710_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_primary714 */ +static ANTLR3_BITWORD FOLLOW_eq_in_primary714_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_eq_in_primary714 = { FOLLOW_eq_in_primary714_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_LIVE_in_live_def738 */ +static ANTLR3_BITWORD FOLLOW_LIVE_in_live_def738_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_LIVE_in_live_def738 = { FOLLOW_LIVE_in_live_def738_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ALL_in_live_def740 */ +static ANTLR3_BITWORD FOLLOW_ALL_in_live_def740_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; +static ANTLR3_BITSET_LIST FOLLOW_ALL_in_live_def740 = { FOLLOW_ALL_in_live_def740_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_live_def742 */ +static ANTLR3_BITWORD FOLLOW_ID_in_live_def742_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_live_def742 = { FOLLOW_ID_in_live_def742_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_LIVE_in_live_def750 */ +static ANTLR3_BITWORD FOLLOW_LIVE_in_live_def750_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_LIVE_in_live_def750 = { FOLLOW_LIVE_in_live_def750_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_live_def752 */ +static ANTLR3_BITWORD FOLLOW_ID_in_live_def752_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_live_def752 = { FOLLOW_ID_in_live_def752_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_UNCONTROL_in_uncontrol764 */ +static ANTLR3_BITWORD FOLLOW_UNCONTROL_in_uncontrol764_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_UNCONTROL_in_uncontrol764 = { FOLLOW_UNCONTROL_in_uncontrol764_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_uncontrol766 */ +static ANTLR3_BITWORD FOLLOW_ID_in_uncontrol766_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_uncontrol766 = { FOLLOW_ID_in_uncontrol766_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_UNOBSERVE_in_unobserve778 */ +static ANTLR3_BITWORD FOLLOW_UNOBSERVE_in_unobserve778_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_UNOBSERVE_in_unobserve778 = { FOLLOW_UNOBSERVE_in_unobserve778_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_unobserve780 */ +static ANTLR3_BITWORD FOLLOW_ID_in_unobserve780_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_unobserve780 = { FOLLOW_ID_in_unobserve780_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_print_in_other_commands792 */ +static ANTLR3_BITWORD FOLLOW_print_in_other_commands792_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_print_in_other_commands792 = { FOLLOW_print_in_other_commands792_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_PRINT_in_print802 */ +static ANTLR3_BITWORD FOLLOW_PRINT_in_print802_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_PRINT_in_print802 = { FOLLOW_PRINT_in_print802_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_print804 */ +static ANTLR3_BITWORD FOLLOW_ID_in_print804_bits[] = { ANTLR3_UINT64_LIT(0x0000000000080208) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_print804 = { FOLLOW_ID_in_print804_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_print806 */ +static ANTLR3_BITWORD FOLLOW_group_elements_in_print806_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_print806 = { FOLLOW_group_elements_in_print806_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_INT_in_number825 */ +static ANTLR3_BITWORD FOLLOW_INT_in_number825_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_INT_in_number825 = { FOLLOW_INT_in_number825_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_MINUS_in_number838 */ +static ANTLR3_BITWORD FOLLOW_MINUS_in_number838_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_MINUS_in_number838 = { FOLLOW_MINUS_in_number838_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_INT_in_number840 */ +static ANTLR3_BITWORD FOLLOW_INT_in_number840_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_INT_in_number840 = { FOLLOW_INT_in_number840_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_group_elements857 */ +static ANTLR3_BITWORD FOLLOW_ID_in_group_elements857_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_group_elements857 = { FOLLOW_ID_in_group_elements857_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_DOT_in_group_elements863 */ +static ANTLR3_BITWORD FOLLOW_DOT_in_group_elements863_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_DOT_in_group_elements863 = { FOLLOW_DOT_in_group_elements863_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_group_elements865 */ +static ANTLR3_BITWORD FOLLOW_group_elements_in_group_elements865_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000200) }; +static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_group_elements865 = { FOLLOW_group_elements_in_group_elements865_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_group_elements867 */ +static ANTLR3_BITWORD FOLLOW_ID_in_group_elements867_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_group_elements867 = { FOLLOW_ID_in_group_elements867_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_numbered_ID877 */ +static ANTLR3_BITWORD FOLLOW_ID_in_numbered_ID877_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_numbered_ID877 = { FOLLOW_ID_in_numbered_ID877_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_numbered_ID883 */ +static ANTLR3_BITWORD FOLLOW_ID_in_numbered_ID883_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_numbered_ID883 = { FOLLOW_ID_in_numbered_ID883_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_INT_in_numbered_ID885 */ +static ANTLR3_BITWORD FOLLOW_INT_in_numbered_ID885_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_INT_in_numbered_ID885 = { FOLLOW_INT_in_numbered_ID885_bits, 1 }; /** Bitset defining follow set for error recovery in rule state: FOLLOW_proc_instantiations_in_synpred2_pncompactor90 */ static ANTLR3_BITWORD FOLLOW_proc_instantiations_in_synpred2_pncompactor90_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; static ANTLR3_BITSET_LIST FOLLOW_proc_instantiations_in_synpred2_pncompactor90 = { FOLLOW_proc_instantiations_in_synpred2_pncompactor90_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_primary_in_synpred27_pncompactor393 */ -static ANTLR3_BITWORD FOLLOW_primary_in_synpred27_pncompactor393_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_primary_in_synpred27_pncompactor393 = { FOLLOW_primary_in_synpred27_pncompactor393_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_MINUS_in_synpred29_pncompactor555 */ -static ANTLR3_BITWORD FOLLOW_MINUS_in_synpred29_pncompactor555_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_MINUS_in_synpred29_pncompactor555 = { FOLLOW_MINUS_in_synpred29_pncompactor555_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_synpred29_pncompactor559 */ -static ANTLR3_BITWORD FOLLOW_eq_in_synpred29_pncompactor559_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_eq_in_synpred29_pncompactor559 = { FOLLOW_eq_in_synpred29_pncompactor559_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_synpred30_pncompactor576 */ -static ANTLR3_BITWORD FOLLOW_ID_in_synpred30_pncompactor576_bits[] = { ANTLR3... [truncated message content] |
From: <the...@us...> - 2009-06-17 22:49:07
|
Revision: 66 http://pntool.svn.sourceforge.net/pntool/?rev=66&view=rev Author: thecodeweasel Date: 2009-06-17 22:46:03 +0000 (Wed, 17 Jun 2009) Log Message: ----------- Adding debug names to the pns structure Modified Paths: -------------- translator/dataStructures.c translator/dataStructures.h translator/pngenerator.c translator/pngenerator.g translator/pngenerator.h Modified: translator/dataStructures.c =================================================================== --- translator/dataStructures.c 2009-06-17 22:08:28 UTC (rev 65) +++ translator/dataStructures.c 2009-06-17 22:46:03 UTC (rev 66) @@ -3,14 +3,15 @@ #include "general.h" //ints are 4 bytes wide, chars are 1 byte wide -static void arrayDelete (ASSOC_ARRAY* array, void* key); -static void* arrayRemove (ASSOC_ARRAY* array, void* key); -static void* arrayGet (ASSOC_ARRAY* array, void* key); -static ANTLR3_INT32 arrayAdd (ASSOC_ARRAY* array, void* key, void* element, void (ANTLR3_CDECL* freeptr)(void*)); -static ANTLR3_UINT32 arraySet (ASSOC_ARRAY* array, ANTLR3_UINT32 key, void* element, void (ANTLR3_CDECL* freeptr)(void*)); -static void arrayFree (ASSOC_ARRAY* array); -static ANTLR3_UINT32 arraySize (ASSOC_ARRAY* array); -static void* arrayIter (ASSOC_ARRAY* array, int i); +static void arrayDelete (ASSOC_ARRAY* array, void* key); +static void* arrayRemove (ASSOC_ARRAY* array, void* key); +static void* arrayGet (ASSOC_ARRAY* array, void* key); +static ANTLR3_INT32 arrayAdd (ASSOC_ARRAY* array, void* key, void* element, void (ANTLR3_CDECL* freeptr)(void*)); +static ANTLR3_UINT32 arraySet (ASSOC_ARRAY* array, ANTLR3_UINT32 key, void* element, void (ANTLR3_CDECL* freeptr)(void*)); +static void arrayFree (ASSOC_ARRAY* array); +static ANTLR3_UINT32 arraySize (ASSOC_ARRAY* array); +static void* arrayIter (ASSOC_ARRAY* array, int i); +static char* arrayIterKeys (ASSOC_ARRAY* array, int i); ASSOC_ARRAY* newAssocArray(ANTLR3_UINT32 sizeHint) { ASSOC_ARRAY* ret; @@ -29,6 +30,7 @@ ret->free = arrayFree; ret->size = arraySize; ret->iter = arrayIter; + ret->iterKeys = arrayIterKeys; return ret; } @@ -93,4 +95,8 @@ void* arrayIter(ASSOC_ARRAY* array, int i) { return array->table->get(array->table, (char*) array->list->get(array->list, i)); +} + +char* arrayIterKeys(ASSOC_ARRAY* array, int i) { + return (char*) array->list->get(array->list, i); } \ No newline at end of file Modified: translator/dataStructures.h =================================================================== --- translator/dataStructures.h 2009-06-17 22:08:28 UTC (rev 65) +++ translator/dataStructures.h 2009-06-17 22:46:03 UTC (rev 66) @@ -25,6 +25,7 @@ //based off the vector size to ensure iterating never goes awry ANTLR3_UINT32 (*size) (struct ASSOC_ARRAY_struct* array); void* (*iter) (struct ASSOC_ARRAY_struct* array, int i); + void* (*iterKeys) (struct ASSOC_ARRAY_struct* array, int i); } ASSOC_ARRAY; #endif \ No newline at end of file Modified: translator/pngenerator.c =================================================================== --- translator/pngenerator.c 2009-06-17 22:08:28 UTC (rev 65) +++ translator/pngenerator.c 2009-06-17 22:46:03 UTC (rev 66) @@ -2,7 +2,7 @@ * This C source file was generated by $ANTLR version 3.1.2 * * - From the grammar source file : /Users/bion/projects/iordache/translator/pngenerator.g - * - On : 2009-06-17 17:07:20 + * - On : 2009-06-17 17:42:55 * - for the tree parser : pngeneratorTreeParser * * Editing it, at least manually, is not wise. * @@ -1576,12 +1576,25 @@ ASSOC_ARRAY* places; ASSOC_ARRAY* trans; - pANTLR3_LIST list = processes->get(processes, (ID1->getText(ID1))->chars); + pANTLR3_LIST list; + int i; + char* key; + + list = processes->get(processes, (ID1->getText(ID1))->chars); (SCOPE_TOP(proc_definitions))->proc= (process*) list->get(list, kPROC); places = (ASSOC_ARRAY*) list->get(list, kPLACES); trans = (ASSOC_ARRAY*) list->get(list, kTRANS); pn = createpn("pnum tnum", (int) places->size(places), (int) trans->size(trans)); (SCOPE_TOP(proc_definitions))->proc->pn = &pn; + //setup debug names + for(i = 0; i < places->size(places); i++) { + key = places->iterKeys(places, i); + updatepn(&pn, "place_name", i, key); + } + for(i = 0; i < trans->size(trans); i++) { + key = trans->iterKeys(trans, i); + updatepn(&pn, "trans_name", i, key); + } } @@ -1607,7 +1620,7 @@ /** * $ANTLR start trans_defs - * /Users/bion/projects/iordache/translator/pngenerator.g:93:1: trans_defs : ( extern_trans_def | trans_def ); + * /Users/bion/projects/iordache/translator/pngenerator.g:106:1: trans_defs : ( extern_trans_def | trans_def ); */ static void trans_defs(ppngenerator ctx) @@ -1618,7 +1631,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:94:2: ( extern_trans_def | trans_def ) + // /Users/bion/projects/iordache/translator/pngenerator.g:107:2: ( extern_trans_def | trans_def ) ANTLR3_UINT32 alt8; @@ -1656,7 +1669,7 @@ switch (alt8) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:94:4: extern_trans_def + // /Users/bion/projects/iordache/translator/pngenerator.g:107:4: extern_trans_def { FOLLOWPUSH(FOLLOW_extern_trans_def_in_trans_defs136); extern_trans_def(ctx); @@ -1674,7 +1687,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:95:4: trans_def + // /Users/bion/projects/iordache/translator/pngenerator.g:108:4: trans_def { FOLLOWPUSH(FOLLOW_trans_def_in_trans_defs141); trans_def(ctx); @@ -1714,7 +1727,7 @@ /** * $ANTLR start extern_trans_def - * /Users/bion/projects/iordache/translator/pngenerator.g:96:1: extern_trans_def : ( ^( TO ( ID )+ ) | ^( FROM ( ID )+ ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:109:1: extern_trans_def : ( ^( TO ( ID )+ ) | ^( FROM ( ID )+ ) ); */ static void extern_trans_def(ppngenerator ctx) @@ -1725,7 +1738,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:97:2: ( ^( TO ( ID )+ ) | ^( FROM ( ID )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:110:2: ( ^( TO ( ID )+ ) | ^( FROM ( ID )+ ) ) ANTLR3_UINT32 alt11; @@ -1763,7 +1776,7 @@ switch (alt11) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:97:4: ^( TO ( ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:110:4: ^( TO ( ID )+ ) { MATCHT(TO, &FOLLOW_TO_in_extern_trans_def151); if (HASEXCEPTION()) @@ -1784,7 +1797,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:97:9: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:110:9: ( ID )+ { int cnt9=0; @@ -1857,7 +1870,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:98:4: ^( FROM ( ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:111:4: ^( FROM ( ID )+ ) { MATCHT(FROM, &FOLLOW_FROM_in_extern_trans_def161); if (HASEXCEPTION()) @@ -1878,7 +1891,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:98:11: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:111:11: ( ID )+ { int cnt10=0; @@ -1973,7 +1986,7 @@ /** * $ANTLR start trans_def - * /Users/bion/projects/iordache/translator/pngenerator.g:99:1: trans_def : ( ^( ID CODE_BLOCK ) | ^( ID ( ID )+ ( CODE_BLOCK )? ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:112:1: trans_def : ( ^( ID CODE_BLOCK ) | ^( ID ( ID )+ ( CODE_BLOCK )? ) ); */ static void trans_def(ppngenerator ctx) @@ -1984,7 +1997,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:100:2: ( ^( ID CODE_BLOCK ) | ^( ID ( ID )+ ( CODE_BLOCK )? ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:113:2: ( ^( ID CODE_BLOCK ) | ^( ID ( ID )+ ( CODE_BLOCK )? ) ) ANTLR3_UINT32 alt14; @@ -2070,7 +2083,7 @@ switch (alt14) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:100:4: ^( ID CODE_BLOCK ) + // /Users/bion/projects/iordache/translator/pngenerator.g:113:4: ^( ID CODE_BLOCK ) { MATCHT(ID, &FOLLOW_ID_in_trans_def175); if (HASEXCEPTION()) @@ -2114,7 +2127,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:101:4: ^( ID ( ID )+ ( CODE_BLOCK )? ) + // /Users/bion/projects/iordache/translator/pngenerator.g:114:4: ^( ID ( ID )+ ( CODE_BLOCK )? ) { MATCHT(ID, &FOLLOW_ID_in_trans_def184); if (HASEXCEPTION()) @@ -2135,7 +2148,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:101:9: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:114:9: ( ID )+ { int cnt12=0; @@ -2195,7 +2208,7 @@ loop12: ; /* Jump to here if this rule does not match */ } - // /Users/bion/projects/iordache/translator/pngenerator.g:101:13: ( CODE_BLOCK )? + // /Users/bion/projects/iordache/translator/pngenerator.g:114:13: ( CODE_BLOCK )? { int alt13=2; { @@ -2261,7 +2274,7 @@ /** * $ANTLR start select_functions - * /Users/bion/projects/iordache/translator/pngenerator.g:102:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:115:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ; */ static void select_functions(ppngenerator ctx) @@ -2271,8 +2284,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:103:2: ( ^( SELECT_DEF ID CODE_BLOCK ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:103:4: ^( SELECT_DEF ID CODE_BLOCK ) + // /Users/bion/projects/iordache/translator/pngenerator.g:116:2: ( ^( SELECT_DEF ID CODE_BLOCK ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:116:4: ^( SELECT_DEF ID CODE_BLOCK ) { MATCHT(SELECT_DEF, &FOLLOW_SELECT_DEF_in_select_functions200); if (HASEXCEPTION()) @@ -2344,7 +2357,7 @@ /** * $ANTLR start nondeterm - * /Users/bion/projects/iordache/translator/pngenerator.g:104:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:117:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ; */ static void nondeterm(ppngenerator ctx) @@ -2354,8 +2367,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:105:2: ( ^( 'nondeterministic places: ' ( ID )+ ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:105:4: ^( 'nondeterministic places: ' ( ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:118:2: ( ^( 'nondeterministic places: ' ( ID )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:118:4: ^( 'nondeterministic places: ' ( ID )+ ) { MATCHT(44, &FOLLOW_44_in_nondeterm215); if (HASEXCEPTION()) @@ -2376,7 +2389,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:105:34: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:118:34: ( ID )+ { int cnt15=0; @@ -2468,7 +2481,7 @@ /** * $ANTLR start proc_instantiations - * /Users/bion/projects/iordache/translator/pngenerator.g:107:1: proc_instantiations : ( proc_init | sync_def | proc_start ); + * /Users/bion/projects/iordache/translator/pngenerator.g:120:1: proc_instantiations : ( proc_init | sync_def | proc_start ); */ static void proc_instantiations(ppngenerator ctx) @@ -2479,7 +2492,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:108:2: ( proc_init | sync_def | proc_start ) + // /Users/bion/projects/iordache/translator/pngenerator.g:121:2: ( proc_init | sync_def | proc_start ) ANTLR3_UINT32 alt16; @@ -2522,7 +2535,7 @@ switch (alt16) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:108:4: proc_init + // /Users/bion/projects/iordache/translator/pngenerator.g:121:4: proc_init { FOLLOWPUSH(FOLLOW_proc_init_in_proc_instantiations229); proc_init(ctx); @@ -2540,7 +2553,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:108:16: sync_def + // /Users/bion/projects/iordache/translator/pngenerator.g:121:16: sync_def { FOLLOWPUSH(FOLLOW_sync_def_in_proc_instantiations233); sync_def(ctx); @@ -2558,7 +2571,7 @@ } break; case 3: - // /Users/bion/projects/iordache/translator/pngenerator.g:108:27: proc_start + // /Users/bion/projects/iordache/translator/pngenerator.g:121:27: proc_start { FOLLOWPUSH(FOLLOW_proc_start_in_proc_instantiations237); proc_start(ctx); @@ -2598,7 +2611,7 @@ /** * $ANTLR start proc_init - * /Users/bion/projects/iordache/translator/pngenerator.g:109:1: proc_init : ^( ID ID ( numbered_ID )+ ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:122:1: proc_init : ^( ID ID ( numbered_ID )+ ) ; */ static void proc_init(ppngenerator ctx) @@ -2608,8 +2621,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:110:2: ( ^( ID ID ( numbered_ID )+ ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:110:4: ^( ID ID ( numbered_ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:123:2: ( ^( ID ID ( numbered_ID )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:123:4: ^( ID ID ( numbered_ID )+ ) { MATCHT(ID, &FOLLOW_ID_in_proc_init247); if (HASEXCEPTION()) @@ -2639,7 +2652,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:110:12: ( numbered_ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:123:12: ( numbered_ID )+ { int cnt17=0; @@ -2734,7 +2747,7 @@ /** * $ANTLR start sync_def - * /Users/bion/projects/iordache/translator/pngenerator.g:111:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:124:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ; */ static void sync_def(ppngenerator ctx) @@ -2744,8 +2757,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:112:2: ( ^( SYNC_TOK ( group_elements )+ ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:112:4: ^( SYNC_TOK ( group_elements )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:125:2: ( ^( SYNC_TOK ( group_elements )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:125:4: ^( SYNC_TOK ( group_elements )+ ) { MATCHT(SYNC_TOK, &FOLLOW_SYNC_TOK_in_sync_def263); if (HASEXCEPTION()) @@ -2766,7 +2779,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:112:15: ( group_elements )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:125:15: ( group_elements )+ { int cnt18=0; @@ -2861,7 +2874,7 @@ /** * $ANTLR start constraints - * /Users/bion/projects/iordache/translator/pngenerator.g:114:1: constraints : ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:127:1: constraints : ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) ; */ static void constraints(ppngenerator ctx) @@ -2871,8 +2884,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:115:2: ( ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:115:4: ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) + // /Users/bion/projects/iordache/translator/pngenerator.g:128:2: ( ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:128:4: ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) { FOLLOWPUSH(FOLLOW_constraint_block_in_constraints278); constraint_block(ctx); @@ -2898,7 +2911,7 @@ return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:115:23: ( eq )* + // /Users/bion/projects/iordache/translator/pngenerator.g:128:23: ( eq )* for (;;) { @@ -2942,7 +2955,7 @@ loop19: ; /* Jump out to here if this rule does not match */ - // /Users/bion/projects/iordache/translator/pngenerator.g:115:27: ( live_def )? + // /Users/bion/projects/iordache/translator/pngenerator.g:128:27: ( live_def )? { int alt20=2; { @@ -2976,7 +2989,7 @@ } } - // /Users/bion/projects/iordache/translator/pngenerator.g:115:37: ( uncontrol )? + // /Users/bion/projects/iordache/translator/pngenerator.g:128:37: ( uncontrol )? { int alt21=2; { @@ -3010,7 +3023,7 @@ } } - // /Users/bion/projects/iordache/translator/pngenerator.g:115:48: ( unobserve )? + // /Users/bion/projects/iordache/translator/pngenerator.g:128:48: ( unobserve )? { int alt22=2; { @@ -3077,7 +3090,7 @@ /** * $ANTLR start proc_start - * /Users/bion/projects/iordache/translator/pngenerator.g:117:1: proc_start : ^( START ( ID )+ ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:130:1: proc_start : ^( START ( ID )+ ) ; */ static void proc_start(ppngenerator ctx) @@ -3087,8 +3100,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:118:2: ( ^( START ( ID )+ ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:118:4: ^( START ( ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:131:2: ( ^( START ( ID )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:131:4: ^( START ( ID )+ ) { MATCHT(START, &FOLLOW_START_in_proc_start302); if (HASEXCEPTION()) @@ -3109,7 +3122,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:118:12: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:131:12: ( ID )+ { int cnt23=0; @@ -3201,7 +3214,7 @@ /** * $ANTLR start constraint_block - * /Users/bion/projects/iordache/translator/pngenerator.g:119:2: constraint_block : ID ; + * /Users/bion/projects/iordache/translator/pngenerator.g:132:2: constraint_block : ID ; */ static void constraint_block(ppngenerator ctx) @@ -3211,8 +3224,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:120:2: ( ID ) - // /Users/bion/projects/iordache/translator/pngenerator.g:120:4: ID + // /Users/bion/projects/iordache/translator/pngenerator.g:133:2: ( ID ) + // /Users/bion/projects/iordache/translator/pngenerator.g:133:4: ID { MATCHT(ID, &FOLLOW_ID_in_constraint_block315); if (HASEXCEPTION()) @@ -3246,7 +3259,7 @@ /** * $ANTLR start eq - * /Users/bion/projects/iordache/translator/pngenerator.g:122:1: eq : ( relationalExpression | ^( EQS_OP eq eq ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:135:1: eq : ( relationalExpression | ^( EQS_OP eq eq ) ); */ static void eq(ppngenerator ctx) @@ -3257,7 +3270,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:123:2: ( relationalExpression | ^( EQS_OP eq eq ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:136:2: ( relationalExpression | ^( EQS_OP eq eq ) ) ANTLR3_UINT32 alt24; @@ -3295,7 +3308,7 @@ switch (alt24) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:123:4: relationalExpression + // /Users/bion/projects/iordache/translator/pngenerator.g:136:4: relationalExpression { FOLLOWPUSH(FOLLOW_relationalExpression_in_eq325); relationalExpression(ctx); @@ -3313,7 +3326,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:124:4: ^( EQS_OP eq eq ) + // /Users/bion/projects/iordache/translator/pngenerator.g:137:4: ^( EQS_OP eq eq ) { MATCHT(EQS_OP, &FOLLOW_EQS_OP_in_eq331); if (HASEXCEPTION()) @@ -3394,7 +3407,7 @@ /** * $ANTLR start relationalExpression - * /Users/bion/projects/iordache/translator/pngenerator.g:126:1: relationalExpression : ( additiveExpression | ^( EQ_OP relationalExpression relationalExpression ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:139:1: relationalExpression : ( additiveExpression | ^( EQ_OP relationalExpression relationalExpression ) ); */ static void relationalExpression(ppngenerator ctx) @@ -3405,7 +3418,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:127:5: ( additiveExpression | ^( EQ_OP relationalExpression relationalExpression ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:140:5: ( additiveExpression | ^( EQ_OP relationalExpression relationalExpression ) ) ANTLR3_UINT32 alt25; @@ -3443,7 +3456,7 @@ switch (alt25) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:127:9: additiveExpression + // /Users/bion/projects/iordache/translator/pngenerator.g:140:9: additiveExpression { FOLLOWPUSH(FOLLOW_additiveExpression_in_relationalExpression351); additiveExpression(ctx); @@ -3461,7 +3474,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:128:7: ^( EQ_OP relationalExpression relationalExpression ) + // /Users/bion/projects/iordache/translator/pngenerator.g:141:7: ^( EQ_OP relationalExpression relationalExpression ) { MATCHT(EQ_OP, &FOLLOW_EQ_OP_in_relationalExpression360); if (HASEXCEPTION()) @@ -3542,7 +3555,7 @@ /** * $ANTLR start additiveExpression - * /Users/bion/projects/iordache/translator/pngenerator.g:130:1: additiveExpression : ( primary | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:143:1: additiveExpression : ( primary | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ); */ static void additiveExpression(ppngenerator ctx) @@ -3553,7 +3566,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:131:5: ( primary | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:144:5: ( primary | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ) ANTLR3_UINT32 alt26; @@ -3655,7 +3668,7 @@ switch (alt26) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:131:9: primary + // /Users/bion/projects/iordache/translator/pngenerator.g:144:9: primary { FOLLOWPUSH(FOLLOW_primary_in_additiveExpression380); primary(ctx); @@ -3673,7 +3686,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:132:7: ^( ADD additiveExpression additiveExpression ) + // /Users/bion/projects/iordache/translator/pngenerator.g:145:7: ^( ADD additiveExpression additiveExpression ) { MATCHT(ADD, &FOLLOW_ADD_in_additiveExpression389); if (HASEXCEPTION()) @@ -3732,7 +3745,7 @@ } break; case 3: - // /Users/bion/projects/iordache/translator/pngenerator.g:133:7: ^( SUB additiveExpression additiveExpression ) + // /Users/bion/projects/iordache/translator/pngenerator.g:146:7: ^( SUB additiveExpression additiveExpression ) { MATCHT(SUB, &FOLLOW_SUB_in_additiveExpression403); if (HASEXCEPTION()) @@ -3813,7 +3826,7 @@ /** * $ANTLR start primary - * /Users/bion/projects/iordache/translator/pngenerator.g:135:1: primary : ( ID | group_elements | NUM | ^( MULT NUM primary ) | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:148:1: primary : ( ID | group_elements | NUM | ^( MULT NUM primary ) | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ); */ static void primary(ppngenerator ctx) @@ -3824,7 +3837,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:136:5: ( ID | group_elements | NUM | ^( MULT NUM primary ) | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:149:5: ( ID | group_elements | NUM | ^( MULT NUM primary ) | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ) ANTLR3_UINT32 alt27; @@ -3910,7 +3923,7 @@ switch (alt27) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:136:9: ID + // /Users/bion/projects/iordache/translator/pngenerator.g:149:9: ID { MATCHT(ID, &FOLLOW_ID_in_primary422); if (HASEXCEPTION()) @@ -3925,7 +3938,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:137:7: group_elements + // /Users/bion/projects/iordache/translator/pngenerator.g:150:7: group_elements { FOLLOWPUSH(FOLLOW_group_elements_in_primary430); group_elements(ctx); @@ -3943,7 +3956,7 @@ } break; case 3: - // /Users/bion/projects/iordache/translator/pngenerator.g:138:7: NUM + // /Users/bion/projects/iordache/translator/pngenerator.g:151:7: NUM { MATCHT(NUM, &FOLLOW_NUM_in_primary438); if (HASEXCEPTION()) @@ -3958,7 +3971,7 @@ } break; case 4: - // /Users/bion/projects/iordache/translator/pngenerator.g:139:7: ^( MULT NUM primary ) + // /Users/bion/projects/iordache/translator/pngenerator.g:152:7: ^( MULT NUM primary ) { MATCHT(MULT, &FOLLOW_MULT_in_primary447); if (HASEXCEPTION()) @@ -4014,7 +4027,7 @@ } break; case 5: - // /Users/bion/projects/iordache/translator/pngenerator.g:140:7: ^( ADD additiveExpression additiveExpression ) + // /Users/bion/projects/iordache/translator/pngenerator.g:153:7: ^( ADD additiveExpression additiveExpression ) { MATCHT(ADD, &FOLLOW_ADD_in_primary461); if (HASEXCEPTION()) @@ -4073,7 +4086,7 @@ } break; case 6: - // /Users/bion/projects/iordache/translator/pngenerator.g:141:7: ^( SUB additiveExpression additiveExpression ) + // /Users/bion/projects/iordache/translator/pngenerator.g:154:7: ^( SUB additiveExpression additiveExpression ) { MATCHT(SUB, &FOLLOW_SUB_in_primary475); if (HASEXCEPTION()) @@ -4154,7 +4167,7 @@ /** * $ANTLR start live_def - * /Users/bion/projects/iordache/translator/pngenerator.g:142:1: live_def : ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:155:1: live_def : ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) ); */ static void live_def(ppngenerator ctx) @@ -4165,7 +4178,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:143:2: ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:156:2: ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) ) ANTLR3_UINT32 alt30; @@ -4251,7 +4264,7 @@ switch (alt30) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:143:4: ^( LIVE ALL ( ID )* ) + // /Users/bion/projects/iordache/translator/pngenerator.g:156:4: ^( LIVE ALL ( ID )* ) { MATCHT(LIVE, &FOLLOW_LIVE_in_live_def490); if (HASEXCEPTION()) @@ -4282,7 +4295,7 @@ return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:143:15: ( ID )* + // /Users/bion/projects/iordache/translator/pngenerator.g:156:15: ( ID )* for (;;) { @@ -4336,7 +4349,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:144:4: ^( LIVE ( ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:157:4: ^( LIVE ( ID )+ ) { MATCHT(LIVE, &FOLLOW_LIVE_in_live_def502); if (HASEXCEPTION()) @@ -4357,7 +4370,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:144:11: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:157:11: ( ID )+ { int cnt29=0; @@ -4452,7 +4465,7 @@ /** * $ANTLR start uncontrol - * /Users/bion/projects/iordache/translator/pngenerator.g:145:1: uncontrol : ^( UNCONTROL ( ID )+ ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:158:1: uncontrol : ^( UNCONTROL ( ID )+ ) ; */ static void uncontrol(ppngenerator ctx) @@ -4462,8 +4475,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:146:2: ( ^( UNCONTROL ( ID )+ ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:146:4: ^( UNCONTROL ( ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:159:2: ( ^( UNCONTROL ( ID )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:159:4: ^( UNCONTROL ( ID )+ ) { MATCHT(UNCONTROL, &FOLLOW_UNCONTROL_in_uncontrol516); if (HASEXCEPTION()) @@ -4484,7 +4497,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:146:16: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:159:16: ( ID )+ { int cnt31=0; @@ -4576,7 +4589,7 @@ /** * $ANTLR start unobserve - * /Users/bion/projects/iordache/translator/pngenerator.g:147:1: unobserve : ^( UNOBSERVE ( ID )+ ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:160:1: unobserve : ^( UNOBSERVE ( ID )+ ) ; */ static void unobserve(ppngenerator ctx) @@ -4586,8 +4599,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:148:2: ( ^( UNOBSERVE ( ID )+ ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:148:4: ^( UNOBSERVE ( ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:161:2: ( ^( UNOBSERVE ( ID )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:161:4: ^( UNOBSERVE ( ID )+ ) { MATCHT(UNOBSERVE, &FOLLOW_UNOBSERVE_in_unobserve530); if (HASEXCEPTION()) @@ -4608,7 +4621,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:148:16: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:161:16: ( ID )+ { int cnt32=0; @@ -4700,7 +4713,7 @@ /** * $ANTLR start other_commands - * /Users/bion/projects/iordache/translator/pngenerator.g:150:1: other_commands : print ; + * /Users/bion/projects/iordache/translator/pngenerator.g:163:1: other_commands : print ; */ static void other_commands(ppngenerator ctx) @@ -4710,8 +4723,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:151:2: ( print ) - // /Users/bion/projects/iordache/translator/pngenerator.g:151:4: print + // /Users/bion/projects/iordache/translator/pngenerator.g:164:2: ( print ) + // /Users/bion/projects/iordache/translator/pngenerator.g:164:4: print { FOLLOWPUSH(FOLLOW_print_in_other_commands544); print(ctx); @@ -4748,7 +4761,7 @@ /** * $ANTLR start print - * /Users/bion/projects/iordache/translator/pngenerator.g:152:1: print : ^( PRINT ID group_elements ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:165:1: print : ^( PRINT ID group_elements ) ; */ static void print(ppngenerator ctx) @@ -4758,8 +4771,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:153:2: ( ^( PRINT ID group_elements ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:153:4: ^( PRINT ID group_elements ) + // /Users/bion/projects/iordache/translator/pngenerator.g:166:2: ( ^( PRINT ID group_elements ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:166:4: ^( PRINT ID group_elements ) { MATCHT(PRINT, &FOLLOW_PRINT_in_print554); if (HASEXCEPTION()) @@ -4834,7 +4847,7 @@ /** * $ANTLR start group_elements - * /Users/bion/projects/iordache/translator/pngenerator.g:155:1: group_elements : ( ID | ^( DOT group_elements ID ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:168:1: group_elements : ( ID | ^( DOT group_elements ID ) ); */ static void group_elements(ppngenerator ctx) @@ -4845,7 +4858,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:156:2: ( ID | ^( DOT group_elements ID ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:169:2: ( ID | ^( DOT group_elements ID ) ) ANTLR3_UINT32 alt33; @@ -4883,7 +4896,7 @@ switch (alt33) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:156:4: ID + // /Users/bion/projects/iordache/translator/pngenerator.g:169:4: ID { MATCHT(ID, &FOLLOW_ID_in_group_elements569); if (HASEXCEPTION()) @@ -4898,7 +4911,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:157:4: ^( DOT group_elements ID ) + // /Users/bion/projects/iordache/translator/pngenerator.g:170:4: ^( DOT group_elements ID ) { MATCHT(DOT, &FOLLOW_DOT_in_group_elements575); if (HASEXCEPTION()) @@ -4976,7 +4989,7 @@ /** * $ANTLR start numbered_ID - * /Users/bion/projects/iordache/translator/pngenerator.g:158:1: numbered_ID : ( ID | ^( ID INT ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:171:1: numbered_ID : ( ID | ^( ID INT ) ); */ static void numbered_ID(ppngenerator ctx) @@ -4987,7 +5000,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:159:2: ( ID | ^( ID INT ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:172:2: ( ID | ^( ID INT ) ) ANTLR3_UINT32 alt34; @@ -5049,7 +5062,7 @@ switch (alt34) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:159:4: ID + // /Users/bion/projects/iordache/translator/pngenerator.g:172:4: ID { MATCHT(ID, &FOLLOW_ID_in_numbered_ID589); if (HASEXCEPTION()) @@ -5064,7 +5077,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:160:4: ^( ID INT ) + // /Users/bion/projects/iordache/translator/pngenerator.g:173:4: ^( ID INT ) { MATCHT(ID, &FOLLOW_ID_in_numbered_ID595); if (HASEXCEPTION()) @@ -5160,8 +5173,8 @@ // $ANTLR start synpred27_pngenerator static void synpred27_pngenerator_fragment(ppngenerator ctx ) { - // /Users/bion/projects/iordache/translator/pngenerator.g:131:9: ( primary ) - // /Users/bion/projects/iordache/translator/pngenerator.g:131:9: primary + // /Users/bion/projects/iordache/translator/pngenerator.g:144:9: ( primary ) + // /Users/bion/projects/iordache/translator/pngenerator.g:144:9: primary { FOLLOWPUSH(FOLLOW_primary_in_synpred27_pngenerator380); primary(ctx); @@ -5189,8 +5202,8 @@ // $ANTLR start synpred28_pngenerator static void synpred28_pngenerator_fragment(ppngenerator ctx ) { - // /Users/bion/projects/iordache/translator/pngenerator.g:132:7: ( ^( ADD additiveExpression additiveExpression ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:132:7: ^( ADD additiveExpression additiveExpression ) + // /Users/bion/projects/iordache/translator/pngenerator.g:145:7: ( ^( ADD additiveExpression additiveExpression ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:145:7: ^( ADD additiveExpression additiveExpression ) { MATCHT(ADD, &FOLLOW_ADD_in_synpred28_pngenerator389); if (HASEXCEPTION()) @@ -5259,8 +5272,8 @@ // $ANTLR start synpred29_pngenerator static void synpred29_pngenerator_fragment(ppngenerator ctx ) { - // /Users/bion/projects/iordache/translator/pngenerator.g:136:9: ( ID ) - // /Users/bion/projects/iordache/translator/pngenerator.g:136:9: ID + // /Users/bion/projects/iordache/translator/pngenerator.g:149:9: ( ID ) + // /Users/bion/projects/iordache/translator/pngenerator.g:149:9: ID { MATCHT(ID, &FOLLOW_ID_in_synpred29_pngenerator422); if (HASEXCEPTION()) @@ -5285,8 +5298,8 @@ // $ANTLR start synpred30_pngenerator static void synpred30_pngenerator_fragment(ppngenerator ctx ) { - // /Users/bion/projects/iordache/translator/pngenerator.g:137:7: ( group_elements ) - // /Users/bion/projects/iordache/translator/pngenerator.g:137:7: group_elements + // /Users/bion/projects/iordache/translator/pngenerator.g:150:7: ( group_elements ) + // /Users/bion/projects/iordache/translator/pngenerator.g:150:7: group_elements { FOLLOWPUSH(FOLLOW_group_elements_in_synpred30_pngenerator430); group_elements(ctx); Modified: translator/pngenerator.g =================================================================== --- translator/pngenerator.g 2009-06-17 22:08:28 UTC (rev 65) +++ translator/pngenerator.g 2009-06-17 22:46:03 UTC (rev 66) @@ -83,12 +83,25 @@ : ID { ASSOC_ARRAY* places; ASSOC_ARRAY* trans; - pANTLR3_LIST list = processes->get(processes, $ID.text->chars); + pANTLR3_LIST list; + int i; + char* key; + + list = processes->get(processes, $ID.text->chars); $proc_definitions::proc = (process*) list->get(list, kPROC); places = (ASSOC_ARRAY*) list->get(list, kPLACES); trans = (ASSOC_ARRAY*) list->get(list, kTRANS); pn = createpn("pnum tnum", (int) places->size(places), (int) trans->size(trans)); $proc_definitions::proc->pn = &pn; + //setup debug names + for(i = 0; i < places->size(places); i++) { + key = places->iterKeys(places, i); + updatepn(&pn, "place_name", i, key); + } + for(i = 0; i < trans->size(trans); i++) { + key = trans->iterKeys(trans, i); + updatepn(&pn, "trans_name", i, key); + } }; trans_defs : extern_trans_def Modified: translator/pngenerator.h =================================================================== --- translator/pngenerator.h 2009-06-17 22:08:28 UTC (rev 65) +++ translator/pngenerator.h 2009-06-17 22:46:03 UTC (rev 66) @@ -2,7 +2,7 @@ * This C header file was generated by $ANTLR version 3.1.2 * * - From the grammar source file : /Users/bion/projects/iordache/translator/pngenerator.g - * - On : 2009-06-17 17:07:20 + * - On : 2009-06-17 17:42:55 * - for the tree parser : pngeneratorTreeParser * * Editing it, at least manually, is not wise. * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2009-06-17 22:08:31
|
Revision: 65 http://pntool.svn.sourceforge.net/pntool/?rev=65&view=rev Author: thecodeweasel Date: 2009-06-17 22:08:28 +0000 (Wed, 17 Jun 2009) Log Message: ----------- The associative arrays had to be more primitive :( Restored functionality from r62 Modified Paths: -------------- translator/dataStructures.c translator/dataStructures.h translator/pngenerator.c translator/pngenerator.g translator/pngenerator.h translator/pnscript.g translator/pnscriptLexer.c translator/pnscriptLexer.h translator/pnscriptParser.c translator/pnscriptParser.h Modified: translator/dataStructures.c =================================================================== --- translator/dataStructures.c 2009-06-17 21:14:16 UTC (rev 64) +++ translator/dataStructures.c 2009-06-17 22:08:28 UTC (rev 65) @@ -10,6 +10,7 @@ static ANTLR3_UINT32 arraySet (ASSOC_ARRAY* array, ANTLR3_UINT32 key, void* element, void (ANTLR3_CDECL* freeptr)(void*)); static void arrayFree (ASSOC_ARRAY* array); static ANTLR3_UINT32 arraySize (ASSOC_ARRAY* array); +static void* arrayIter (ASSOC_ARRAY* array, int i); ASSOC_ARRAY* newAssocArray(ANTLR3_UINT32 sizeHint) { ASSOC_ARRAY* ret; @@ -27,56 +28,29 @@ ret->set = arraySet; ret->free = arrayFree; ret->size = arraySize; + ret->iter = arrayIter; return ret; } -bool isInt(void* key) { - if(sizeof(*key) == 4) - return true; - return false; -} - void arrayDelete(ASSOC_ARRAY* array, void* key) { - if(isInt(key)) { - char* strKey; - strKey = (char*) array->list->get(array->list, *((int*)key)); - array->list->del(array->list, *((int*)key)); - array->table->del(array->table, strKey); - } else { - int intKey; - intKey = *((int*) array->table->get(array->table, (char*) key)); - array->list->del(array->list, intKey); - array->table->del(array->table, (char*) key); - } + int intKey; + intKey = *((int*) array->table->get(array->table, (char*) key)); + array->list->del(array->list, intKey); + array->table->del(array->table, (char*) key); } void* arrayRemove(ASSOC_ARRAY* array, void* key) { void* ret; - if(isInt(key)) { - char* strKey; - strKey = (char*) array->list->get(array->list, *((int*)key)); - array->list->del(array->list, *((int*)key)); - ret = array->table->remove(array->table, strKey); - } else { - int intKey; - intKey = *((int*) array->table->get(array->table, (char*) key)); - array->list->del(array->list, intKey); - ret = array->table->remove(array->table, (char*) key); - } + int intKey; + intKey = *((int*) array->table->get(array->table, (char*) key)); + array->list->del(array->list, intKey); + ret = array->table->remove(array->table, (char*) key); return ret; } void* arrayGet(ASSOC_ARRAY* array, void* key) { - void* ret; - if(isInt(key)) { - char* strKey; - strKey = (char*) array->list->get(array->list, *((int*)key)); - ret = array->table->get(array->table, strKey); - } else { - ret = array->table->get(array->table, (char*) key); - } - return ret; + return array->table->get(array->table, (char*) key); } ANTLR3_INT32 arrayAdd(ASSOC_ARRAY* array, void* key, void* element, void (ANTLR3_CDECL* freeptr)(void*)) { @@ -93,20 +67,16 @@ ANTLR3_UINT32 ret; char* strKey; static int intKey; + int i; - if(isInt((void*) key)) { - intKey = *((int*) key); - strKey = (char*) array->list->get(array->list, intKey); - } else { - int i; - strKey = (char*) key; - for(i = 0; i < array->list->size(array->list); i++) { - if(strcmp((char*) array->list->get(array->list, i), strKey)) { - intKey = i; - break; - } + strKey = (char*) key; + for(i = 0; i < array->list->size(array->list); i++) { + if(strcmp((char*) array->list->get(array->list, i), strKey)) { + intKey = i; + break; } } + array->list->set(array->list, intKey, strKey, NULL, false); ret = array->table->put(array->table, strKey, element, freeptr); return ret; @@ -119,4 +89,8 @@ ANTLR3_UINT32 arraySize(ASSOC_ARRAY* array) { return array->list->size(array->list); +} + +void* arrayIter(ASSOC_ARRAY* array, int i) { + return array->table->get(array->table, (char*) array->list->get(array->list, i)); } \ No newline at end of file Modified: translator/dataStructures.h =================================================================== --- translator/dataStructures.h 2009-06-17 21:14:16 UTC (rev 64) +++ translator/dataStructures.h 2009-06-17 22:08:28 UTC (rev 65) @@ -24,6 +24,7 @@ ANTLR3_UINT32 (*set) (struct ASSOC_ARRAY_struct* array, ANTLR3_UINT32 key, void* element, void (ANTLR3_CDECL* freeptr)(void*)); //based off the vector size to ensure iterating never goes awry ANTLR3_UINT32 (*size) (struct ASSOC_ARRAY_struct* array); + void* (*iter) (struct ASSOC_ARRAY_struct* array, int i); } ASSOC_ARRAY; #endif \ No newline at end of file Modified: translator/pngenerator.c =================================================================== --- translator/pngenerator.c 2009-06-17 21:14:16 UTC (rev 64) +++ translator/pngenerator.c 2009-06-17 22:08:28 UTC (rev 65) @@ -2,7 +2,7 @@ * This C source file was generated by $ANTLR version 3.1.2 * * - From the grammar source file : /Users/bion/projects/iordache/translator/pngenerator.g - * - On : 2009-06-17 16:11:12 + * - On : 2009-06-17 17:07:20 * - for the tree parser : pngeneratorTreeParser * * Editing it, at least manually, is not wise. * @@ -1574,9 +1574,13 @@ if ( BACKTRACKING==0 ) { + ASSOC_ARRAY* places; + ASSOC_ARRAY* trans; pANTLR3_LIST list = processes->get(processes, (ID1->getText(ID1))->chars); (SCOPE_TOP(proc_definitions))->proc= (process*) list->get(list, kPROC); - // pn = createpn("pnum tnum", *((int*) list->get(list, kNUM_PLACES)), *((int*) list->get(list, kNUM_TRANS))); + places = (ASSOC_ARRAY*) list->get(list, kPLACES); + trans = (ASSOC_ARRAY*) list->get(list, kTRANS); + pn = createpn("pnum tnum", (int) places->size(places), (int) trans->size(trans)); (SCOPE_TOP(proc_definitions))->proc->pn = &pn; } @@ -1603,7 +1607,7 @@ /** * $ANTLR start trans_defs - * /Users/bion/projects/iordache/translator/pngenerator.g:89:1: trans_defs : ( extern_trans_def | trans_def ); + * /Users/bion/projects/iordache/translator/pngenerator.g:93:1: trans_defs : ( extern_trans_def | trans_def ); */ static void trans_defs(ppngenerator ctx) @@ -1614,7 +1618,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:90:2: ( extern_trans_def | trans_def ) + // /Users/bion/projects/iordache/translator/pngenerator.g:94:2: ( extern_trans_def | trans_def ) ANTLR3_UINT32 alt8; @@ -1652,7 +1656,7 @@ switch (alt8) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:90:4: extern_trans_def + // /Users/bion/projects/iordache/translator/pngenerator.g:94:4: extern_trans_def { FOLLOWPUSH(FOLLOW_extern_trans_def_in_trans_defs136); extern_trans_def(ctx); @@ -1670,7 +1674,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:91:4: trans_def + // /Users/bion/projects/iordache/translator/pngenerator.g:95:4: trans_def { FOLLOWPUSH(FOLLOW_trans_def_in_trans_defs141); trans_def(ctx); @@ -1710,7 +1714,7 @@ /** * $ANTLR start extern_trans_def - * /Users/bion/projects/iordache/translator/pngenerator.g:92:1: extern_trans_def : ( ^( TO ( ID )+ ) | ^( FROM ( ID )+ ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:96:1: extern_trans_def : ( ^( TO ( ID )+ ) | ^( FROM ( ID )+ ) ); */ static void extern_trans_def(ppngenerator ctx) @@ -1721,7 +1725,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:93:2: ( ^( TO ( ID )+ ) | ^( FROM ( ID )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:97:2: ( ^( TO ( ID )+ ) | ^( FROM ( ID )+ ) ) ANTLR3_UINT32 alt11; @@ -1759,7 +1763,7 @@ switch (alt11) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:93:4: ^( TO ( ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:97:4: ^( TO ( ID )+ ) { MATCHT(TO, &FOLLOW_TO_in_extern_trans_def151); if (HASEXCEPTION()) @@ -1780,7 +1784,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:93:9: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:97:9: ( ID )+ { int cnt9=0; @@ -1853,7 +1857,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:94:4: ^( FROM ( ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:98:4: ^( FROM ( ID )+ ) { MATCHT(FROM, &FOLLOW_FROM_in_extern_trans_def161); if (HASEXCEPTION()) @@ -1874,7 +1878,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:94:11: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:98:11: ( ID )+ { int cnt10=0; @@ -1969,7 +1973,7 @@ /** * $ANTLR start trans_def - * /Users/bion/projects/iordache/translator/pngenerator.g:95:1: trans_def : ( ^( ID CODE_BLOCK ) | ^( ID ( ID )+ ( CODE_BLOCK )? ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:99:1: trans_def : ( ^( ID CODE_BLOCK ) | ^( ID ( ID )+ ( CODE_BLOCK )? ) ); */ static void trans_def(ppngenerator ctx) @@ -1980,7 +1984,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:96:2: ( ^( ID CODE_BLOCK ) | ^( ID ( ID )+ ( CODE_BLOCK )? ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:100:2: ( ^( ID CODE_BLOCK ) | ^( ID ( ID )+ ( CODE_BLOCK )? ) ) ANTLR3_UINT32 alt14; @@ -2066,7 +2070,7 @@ switch (alt14) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:96:4: ^( ID CODE_BLOCK ) + // /Users/bion/projects/iordache/translator/pngenerator.g:100:4: ^( ID CODE_BLOCK ) { MATCHT(ID, &FOLLOW_ID_in_trans_def175); if (HASEXCEPTION()) @@ -2110,7 +2114,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:97:4: ^( ID ( ID )+ ( CODE_BLOCK )? ) + // /Users/bion/projects/iordache/translator/pngenerator.g:101:4: ^( ID ( ID )+ ( CODE_BLOCK )? ) { MATCHT(ID, &FOLLOW_ID_in_trans_def184); if (HASEXCEPTION()) @@ -2131,7 +2135,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:97:9: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:101:9: ( ID )+ { int cnt12=0; @@ -2191,7 +2195,7 @@ loop12: ; /* Jump to here if this rule does not match */ } - // /Users/bion/projects/iordache/translator/pngenerator.g:97:13: ( CODE_BLOCK )? + // /Users/bion/projects/iordache/translator/pngenerator.g:101:13: ( CODE_BLOCK )? { int alt13=2; { @@ -2257,7 +2261,7 @@ /** * $ANTLR start select_functions - * /Users/bion/projects/iordache/translator/pngenerator.g:98:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:102:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ; */ static void select_functions(ppngenerator ctx) @@ -2267,8 +2271,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:99:2: ( ^( SELECT_DEF ID CODE_BLOCK ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:99:4: ^( SELECT_DEF ID CODE_BLOCK ) + // /Users/bion/projects/iordache/translator/pngenerator.g:103:2: ( ^( SELECT_DEF ID CODE_BLOCK ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:103:4: ^( SELECT_DEF ID CODE_BLOCK ) { MATCHT(SELECT_DEF, &FOLLOW_SELECT_DEF_in_select_functions200); if (HASEXCEPTION()) @@ -2340,7 +2344,7 @@ /** * $ANTLR start nondeterm - * /Users/bion/projects/iordache/translator/pngenerator.g:100:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:104:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ; */ static void nondeterm(ppngenerator ctx) @@ -2350,8 +2354,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:101:2: ( ^( 'nondeterministic places: ' ( ID )+ ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:101:4: ^( 'nondeterministic places: ' ( ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:105:2: ( ^( 'nondeterministic places: ' ( ID )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:105:4: ^( 'nondeterministic places: ' ( ID )+ ) { MATCHT(44, &FOLLOW_44_in_nondeterm215); if (HASEXCEPTION()) @@ -2372,7 +2376,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:101:34: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:105:34: ( ID )+ { int cnt15=0; @@ -2464,7 +2468,7 @@ /** * $ANTLR start proc_instantiations - * /Users/bion/projects/iordache/translator/pngenerator.g:103:1: proc_instantiations : ( proc_init | sync_def | proc_start ); + * /Users/bion/projects/iordache/translator/pngenerator.g:107:1: proc_instantiations : ( proc_init | sync_def | proc_start ); */ static void proc_instantiations(ppngenerator ctx) @@ -2475,7 +2479,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:104:2: ( proc_init | sync_def | proc_start ) + // /Users/bion/projects/iordache/translator/pngenerator.g:108:2: ( proc_init | sync_def | proc_start ) ANTLR3_UINT32 alt16; @@ -2518,7 +2522,7 @@ switch (alt16) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:104:4: proc_init + // /Users/bion/projects/iordache/translator/pngenerator.g:108:4: proc_init { FOLLOWPUSH(FOLLOW_proc_init_in_proc_instantiations229); proc_init(ctx); @@ -2536,7 +2540,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:104:16: sync_def + // /Users/bion/projects/iordache/translator/pngenerator.g:108:16: sync_def { FOLLOWPUSH(FOLLOW_sync_def_in_proc_instantiations233); sync_def(ctx); @@ -2554,7 +2558,7 @@ } break; case 3: - // /Users/bion/projects/iordache/translator/pngenerator.g:104:27: proc_start + // /Users/bion/projects/iordache/translator/pngenerator.g:108:27: proc_start { FOLLOWPUSH(FOLLOW_proc_start_in_proc_instantiations237); proc_start(ctx); @@ -2594,7 +2598,7 @@ /** * $ANTLR start proc_init - * /Users/bion/projects/iordache/translator/pngenerator.g:105:1: proc_init : ^( ID ID ( numbered_ID )+ ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:109:1: proc_init : ^( ID ID ( numbered_ID )+ ) ; */ static void proc_init(ppngenerator ctx) @@ -2604,8 +2608,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:106:2: ( ^( ID ID ( numbered_ID )+ ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:106:4: ^( ID ID ( numbered_ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:110:2: ( ^( ID ID ( numbered_ID )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:110:4: ^( ID ID ( numbered_ID )+ ) { MATCHT(ID, &FOLLOW_ID_in_proc_init247); if (HASEXCEPTION()) @@ -2635,7 +2639,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:106:12: ( numbered_ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:110:12: ( numbered_ID )+ { int cnt17=0; @@ -2730,7 +2734,7 @@ /** * $ANTLR start sync_def - * /Users/bion/projects/iordache/translator/pngenerator.g:107:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:111:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ; */ static void sync_def(ppngenerator ctx) @@ -2740,8 +2744,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:108:2: ( ^( SYNC_TOK ( group_elements )+ ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:108:4: ^( SYNC_TOK ( group_elements )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:112:2: ( ^( SYNC_TOK ( group_elements )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:112:4: ^( SYNC_TOK ( group_elements )+ ) { MATCHT(SYNC_TOK, &FOLLOW_SYNC_TOK_in_sync_def263); if (HASEXCEPTION()) @@ -2762,7 +2766,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:108:15: ( group_elements )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:112:15: ( group_elements )+ { int cnt18=0; @@ -2857,7 +2861,7 @@ /** * $ANTLR start constraints - * /Users/bion/projects/iordache/translator/pngenerator.g:110:1: constraints : ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:114:1: constraints : ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) ; */ static void constraints(ppngenerator ctx) @@ -2867,8 +2871,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:111:2: ( ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:111:4: ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) + // /Users/bion/projects/iordache/translator/pngenerator.g:115:2: ( ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:115:4: ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) { FOLLOWPUSH(FOLLOW_constraint_block_in_constraints278); constraint_block(ctx); @@ -2894,7 +2898,7 @@ return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:111:23: ( eq )* + // /Users/bion/projects/iordache/translator/pngenerator.g:115:23: ( eq )* for (;;) { @@ -2938,7 +2942,7 @@ loop19: ; /* Jump out to here if this rule does not match */ - // /Users/bion/projects/iordache/translator/pngenerator.g:111:27: ( live_def )? + // /Users/bion/projects/iordache/translator/pngenerator.g:115:27: ( live_def )? { int alt20=2; { @@ -2972,7 +2976,7 @@ } } - // /Users/bion/projects/iordache/translator/pngenerator.g:111:37: ( uncontrol )? + // /Users/bion/projects/iordache/translator/pngenerator.g:115:37: ( uncontrol )? { int alt21=2; { @@ -3006,7 +3010,7 @@ } } - // /Users/bion/projects/iordache/translator/pngenerator.g:111:48: ( unobserve )? + // /Users/bion/projects/iordache/translator/pngenerator.g:115:48: ( unobserve )? { int alt22=2; { @@ -3073,7 +3077,7 @@ /** * $ANTLR start proc_start - * /Users/bion/projects/iordache/translator/pngenerator.g:113:1: proc_start : ^( START ( ID )+ ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:117:1: proc_start : ^( START ( ID )+ ) ; */ static void proc_start(ppngenerator ctx) @@ -3083,8 +3087,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:114:2: ( ^( START ( ID )+ ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:114:4: ^( START ( ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:118:2: ( ^( START ( ID )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:118:4: ^( START ( ID )+ ) { MATCHT(START, &FOLLOW_START_in_proc_start302); if (HASEXCEPTION()) @@ -3105,7 +3109,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:114:12: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:118:12: ( ID )+ { int cnt23=0; @@ -3197,7 +3201,7 @@ /** * $ANTLR start constraint_block - * /Users/bion/projects/iordache/translator/pngenerator.g:115:2: constraint_block : ID ; + * /Users/bion/projects/iordache/translator/pngenerator.g:119:2: constraint_block : ID ; */ static void constraint_block(ppngenerator ctx) @@ -3207,8 +3211,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:116:2: ( ID ) - // /Users/bion/projects/iordache/translator/pngenerator.g:116:4: ID + // /Users/bion/projects/iordache/translator/pngenerator.g:120:2: ( ID ) + // /Users/bion/projects/iordache/translator/pngenerator.g:120:4: ID { MATCHT(ID, &FOLLOW_ID_in_constraint_block315); if (HASEXCEPTION()) @@ -3242,7 +3246,7 @@ /** * $ANTLR start eq - * /Users/bion/projects/iordache/translator/pngenerator.g:118:1: eq : ( relationalExpression | ^( EQS_OP eq eq ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:122:1: eq : ( relationalExpression | ^( EQS_OP eq eq ) ); */ static void eq(ppngenerator ctx) @@ -3253,7 +3257,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:119:2: ( relationalExpression | ^( EQS_OP eq eq ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:123:2: ( relationalExpression | ^( EQS_OP eq eq ) ) ANTLR3_UINT32 alt24; @@ -3291,7 +3295,7 @@ switch (alt24) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:119:4: relationalExpression + // /Users/bion/projects/iordache/translator/pngenerator.g:123:4: relationalExpression { FOLLOWPUSH(FOLLOW_relationalExpression_in_eq325); relationalExpression(ctx); @@ -3309,7 +3313,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:120:4: ^( EQS_OP eq eq ) + // /Users/bion/projects/iordache/translator/pngenerator.g:124:4: ^( EQS_OP eq eq ) { MATCHT(EQS_OP, &FOLLOW_EQS_OP_in_eq331); if (HASEXCEPTION()) @@ -3390,7 +3394,7 @@ /** * $ANTLR start relationalExpression - * /Users/bion/projects/iordache/translator/pngenerator.g:122:1: relationalExpression : ( additiveExpression | ^( EQ_OP relationalExpression relationalExpression ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:126:1: relationalExpression : ( additiveExpression | ^( EQ_OP relationalExpression relationalExpression ) ); */ static void relationalExpression(ppngenerator ctx) @@ -3401,7 +3405,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:123:5: ( additiveExpression | ^( EQ_OP relationalExpression relationalExpression ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:127:5: ( additiveExpression | ^( EQ_OP relationalExpression relationalExpression ) ) ANTLR3_UINT32 alt25; @@ -3439,7 +3443,7 @@ switch (alt25) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:123:9: additiveExpression + // /Users/bion/projects/iordache/translator/pngenerator.g:127:9: additiveExpression { FOLLOWPUSH(FOLLOW_additiveExpression_in_relationalExpression351); additiveExpression(ctx); @@ -3457,7 +3461,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:124:7: ^( EQ_OP relationalExpression relationalExpression ) + // /Users/bion/projects/iordache/translator/pngenerator.g:128:7: ^( EQ_OP relationalExpression relationalExpression ) { MATCHT(EQ_OP, &FOLLOW_EQ_OP_in_relationalExpression360); if (HASEXCEPTION()) @@ -3538,7 +3542,7 @@ /** * $ANTLR start additiveExpression - * /Users/bion/projects/iordache/translator/pngenerator.g:126:1: additiveExpression : ( primary | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:130:1: additiveExpression : ( primary | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ); */ static void additiveExpression(ppngenerator ctx) @@ -3549,7 +3553,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:127:5: ( primary | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:131:5: ( primary | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ) ANTLR3_UINT32 alt26; @@ -3651,7 +3655,7 @@ switch (alt26) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:127:9: primary + // /Users/bion/projects/iordache/translator/pngenerator.g:131:9: primary { FOLLOWPUSH(FOLLOW_primary_in_additiveExpression380); primary(ctx); @@ -3669,7 +3673,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:128:7: ^( ADD additiveExpression additiveExpression ) + // /Users/bion/projects/iordache/translator/pngenerator.g:132:7: ^( ADD additiveExpression additiveExpression ) { MATCHT(ADD, &FOLLOW_ADD_in_additiveExpression389); if (HASEXCEPTION()) @@ -3728,7 +3732,7 @@ } break; case 3: - // /Users/bion/projects/iordache/translator/pngenerator.g:129:7: ^( SUB additiveExpression additiveExpression ) + // /Users/bion/projects/iordache/translator/pngenerator.g:133:7: ^( SUB additiveExpression additiveExpression ) { MATCHT(SUB, &FOLLOW_SUB_in_additiveExpression403); if (HASEXCEPTION()) @@ -3809,7 +3813,7 @@ /** * $ANTLR start primary - * /Users/bion/projects/iordache/translator/pngenerator.g:131:1: primary : ( ID | group_elements | NUM | ^( MULT NUM primary ) | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:135:1: primary : ( ID | group_elements | NUM | ^( MULT NUM primary ) | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ); */ static void primary(ppngenerator ctx) @@ -3820,7 +3824,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:132:5: ( ID | group_elements | NUM | ^( MULT NUM primary ) | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:136:5: ( ID | group_elements | NUM | ^( MULT NUM primary ) | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ) ANTLR3_UINT32 alt27; @@ -3906,7 +3910,7 @@ switch (alt27) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:132:9: ID + // /Users/bion/projects/iordache/translator/pngenerator.g:136:9: ID { MATCHT(ID, &FOLLOW_ID_in_primary422); if (HASEXCEPTION()) @@ -3921,7 +3925,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:133:7: group_elements + // /Users/bion/projects/iordache/translator/pngenerator.g:137:7: group_elements { FOLLOWPUSH(FOLLOW_group_elements_in_primary430); group_elements(ctx); @@ -3939,7 +3943,7 @@ } break; case 3: - // /Users/bion/projects/iordache/translator/pngenerator.g:134:7: NUM + // /Users/bion/projects/iordache/translator/pngenerator.g:138:7: NUM { MATCHT(NUM, &FOLLOW_NUM_in_primary438); if (HASEXCEPTION()) @@ -3954,7 +3958,7 @@ } break; case 4: - // /Users/bion/projects/iordache/translator/pngenerator.g:135:7: ^( MULT NUM primary ) + // /Users/bion/projects/iordache/translator/pngenerator.g:139:7: ^( MULT NUM primary ) { MATCHT(MULT, &FOLLOW_MULT_in_primary447); if (HASEXCEPTION()) @@ -4010,7 +4014,7 @@ } break; case 5: - // /Users/bion/projects/iordache/translator/pngenerator.g:136:7: ^( ADD additiveExpression additiveExpression ) + // /Users/bion/projects/iordache/translator/pngenerator.g:140:7: ^( ADD additiveExpression additiveExpression ) { MATCHT(ADD, &FOLLOW_ADD_in_primary461); if (HASEXCEPTION()) @@ -4069,7 +4073,7 @@ } break; case 6: - // /Users/bion/projects/iordache/translator/pngenerator.g:137:7: ^( SUB additiveExpression additiveExpression ) + // /Users/bion/projects/iordache/translator/pngenerator.g:141:7: ^( SUB additiveExpression additiveExpression ) { MATCHT(SUB, &FOLLOW_SUB_in_primary475); if (HASEXCEPTION()) @@ -4150,7 +4154,7 @@ /** * $ANTLR start live_def - * /Users/bion/projects/iordache/translator/pngenerator.g:138:1: live_def : ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:142:1: live_def : ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) ); */ static void live_def(ppngenerator ctx) @@ -4161,7 +4165,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:139:2: ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:143:2: ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) ) ANTLR3_UINT32 alt30; @@ -4247,7 +4251,7 @@ switch (alt30) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:139:4: ^( LIVE ALL ( ID )* ) + // /Users/bion/projects/iordache/translator/pngenerator.g:143:4: ^( LIVE ALL ( ID )* ) { MATCHT(LIVE, &FOLLOW_LIVE_in_live_def490); if (HASEXCEPTION()) @@ -4278,7 +4282,7 @@ return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:139:15: ( ID )* + // /Users/bion/projects/iordache/translator/pngenerator.g:143:15: ( ID )* for (;;) { @@ -4332,7 +4336,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:140:4: ^( LIVE ( ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:144:4: ^( LIVE ( ID )+ ) { MATCHT(LIVE, &FOLLOW_LIVE_in_live_def502); if (HASEXCEPTION()) @@ -4353,7 +4357,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:140:11: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:144:11: ( ID )+ { int cnt29=0; @@ -4448,7 +4452,7 @@ /** * $ANTLR start uncontrol - * /Users/bion/projects/iordache/translator/pngenerator.g:141:1: uncontrol : ^( UNCONTROL ( ID )+ ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:145:1: uncontrol : ^( UNCONTROL ( ID )+ ) ; */ static void uncontrol(ppngenerator ctx) @@ -4458,8 +4462,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:142:2: ( ^( UNCONTROL ( ID )+ ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:142:4: ^( UNCONTROL ( ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:146:2: ( ^( UNCONTROL ( ID )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:146:4: ^( UNCONTROL ( ID )+ ) { MATCHT(UNCONTROL, &FOLLOW_UNCONTROL_in_uncontrol516); if (HASEXCEPTION()) @@ -4480,7 +4484,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:142:16: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:146:16: ( ID )+ { int cnt31=0; @@ -4572,7 +4576,7 @@ /** * $ANTLR start unobserve - * /Users/bion/projects/iordache/translator/pngenerator.g:143:1: unobserve : ^( UNOBSERVE ( ID )+ ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:147:1: unobserve : ^( UNOBSERVE ( ID )+ ) ; */ static void unobserve(ppngenerator ctx) @@ -4582,8 +4586,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:144:2: ( ^( UNOBSERVE ( ID )+ ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:144:4: ^( UNOBSERVE ( ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:148:2: ( ^( UNOBSERVE ( ID )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:148:4: ^( UNOBSERVE ( ID )+ ) { MATCHT(UNOBSERVE, &FOLLOW_UNOBSERVE_in_unobserve530); if (HASEXCEPTION()) @@ -4604,7 +4608,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:144:16: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:148:16: ( ID )+ { int cnt32=0; @@ -4696,7 +4700,7 @@ /** * $ANTLR start other_commands - * /Users/bion/projects/iordache/translator/pngenerator.g:146:1: other_commands : print ; + * /Users/bion/projects/iordache/translator/pngenerator.g:150:1: other_commands : print ; */ static void other_commands(ppngenerator ctx) @@ -4706,8 +4710,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:147:2: ( print ) - // /Users/bion/projects/iordache/translator/pngenerator.g:147:4: print + // /Users/bion/projects/iordache/translator/pngenerator.g:151:2: ( print ) + // /Users/bion/projects/iordache/translator/pngenerator.g:151:4: print { FOLLOWPUSH(FOLLOW_print_in_other_commands544); print(ctx); @@ -4744,7 +4748,7 @@ /** * $ANTLR start print - * /Users/bion/projects/iordache/translator/pngenerator.g:148:1: print : ^( PRINT ID group_elements ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:152:1: print : ^( PRINT ID group_elements ) ; */ static void print(ppngenerator ctx) @@ -4754,8 +4758,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:149:2: ( ^( PRINT ID group_elements ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:149:4: ^( PRINT ID group_elements ) + // /Users/bion/projects/iordache/translator/pngenerator.g:153:2: ( ^( PRINT ID group_elements ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:153:4: ^( PRINT ID group_elements ) { MATCHT(PRINT, &FOLLOW_PRINT_in_print554); if (HASEXCEPTION()) @@ -4830,7 +4834,7 @@ /** * $ANTLR start group_elements - * /Users/bion/projects/iordache/translator/pngenerator.g:151:1: group_elements : ( ID | ^( DOT group_elements ID ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:155:1: group_elements : ( ID | ^( DOT group_elements ID ) ); */ static void group_elements(ppngenerator ctx) @@ -4841,7 +4845,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:152:2: ( ID | ^( DOT group_elements ID ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:156:2: ( ID | ^( DOT group_elements ID ) ) ANTLR3_UINT32 alt33; @@ -4879,7 +4883,7 @@ switch (alt33) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:152:4: ID + // /Users/bion/projects/iordache/translator/pngenerator.g:156:4: ID { MATCHT(ID, &FOLLOW_ID_in_group_elements569); if (HASEXCEPTION()) @@ -4894,7 +4898,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:153:4: ^( DOT group_elements ID ) + // /Users/bion/projects/iordache/translator/pngenerator.g:157:4: ^( DOT group_elements ID ) { MATCHT(DOT, &FOLLOW_DOT_in_group_elements575); if (HASEXCEPTION()) @@ -4972,7 +4976,7 @@ /** * $ANTLR start numbered_ID - * /Users/bion/projects/iordache/translator/pngenerator.g:154:1: numbered_ID : ( ID | ^( ID INT ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:158:1: numbered_ID : ( ID | ^( ID INT ) ); */ static void numbered_ID(ppngenerator ctx) @@ -4983,7 +4987,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:155:2: ( ID | ^( ID INT ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:159:2: ( ID | ^( ID INT ) ) ANTLR3_UINT32 alt34; @@ -5045,7 +5049,7 @@ switch (alt34) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:155:4: ID + // /Users/bion/projects/iordache/translator/pngenerator.g:159:4: ID { MATCHT(ID, &FOLLOW_ID_in_numbered_ID589); if (HASEXCEPTION()) @@ -5060,7 +5064,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:156:4: ^( ID INT ) + // /Users/bion/projects/iordache/translator/pngenerator.g:160:4: ^( ID INT ) { MATCHT(ID, &FOLLOW_ID_in_numbered_ID595); if (HASEXCEPTION()) @@ -5156,8 +5160,8 @@ // $ANTLR start synpred27_pngenerator static void synpred27_pngenerator_fragment(ppngenerator ctx ) { - // /Users/bion/projects/iordache/translator/pngenerator.g:127:9: ( primary ) - // /Users/bion/projects/iordache/translator/pngenerator.g:127:9: primary + // /Users/bion/projects/iordache/translator/pngenerator.g:131:9: ( primary ) + // /Users/bion/projects/iordache/translator/pngenerator.g:131:9: primary { FOLLOWPUSH(FOLLOW_primary_in_synpred27_pngenerator380); primary(ctx); @@ -5185,8 +5189,8 @@ // $ANTLR start synpred28_pngenerator static void synpred28_pngenerator_fragment(ppngenerator ctx ) { - // /Users/bion/projects/iordache/translator/pngenerator.g:128:7: ( ^( ADD additiveExpression additiveExpression ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:128:7: ^( ADD additiveExpression additiveExpression ) + // /Users/bion/projects/iordache/translator/pngenerator.g:132:7: ( ^( ADD additiveExpression additiveExpression ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:132:7: ^( ADD additiveExpression additiveExpression ) { MATCHT(ADD, &FOLLOW_ADD_in_synpred28_pngenerator389); if (HASEXCEPTION()) @@ -5255,8 +5259,8 @@ // $ANTLR start synpred29_pngenerator static void synpred29_pngenerator_fragment(ppngenerator ctx ) { - // /Users/bion/projects/iordache/translator/pngenerator.g:132:9: ( ID ) - // /Users/bion/projects/iordache/translator/pngenerator.g:132:9: ID + // /Users/bion/projects/iordache/translator/pngenerator.g:136:9: ( ID ) + // /Users/bion/projects/iordache/translator/pngenerator.g:136:9: ID { MATCHT(ID, &FOLLOW_ID_in_synpred29_pngenerator422); if (HASEXCEPTION()) @@ -5281,8 +5285,8 @@ // $ANTLR start synpred30_pngenerator static void synpred30_pngenerator_fragment(ppngenerator ctx ) { - // /Users/bion/projects/iordache/translator/pngenerator.g:133:7: ( group_elements ) - // /Users/bion/projects/iordache/translator/pngenerator.g:133:7: group_elements + // /Users/bion/projects/iordache/translator/pngenerator.g:137:7: ( group_elements ) + // /Users/bion/projects/iordache/translator/pngenerator.g:137:7: group_elements { FOLLOWPUSH(FOLLOW_group_elements_in_synpred30_pngenerator430); group_elements(ctx); Modified: translator/pngenerator.g =================================================================== --- translator/pngenerator.g 2009-06-17 21:14:16 UTC (rev 64) +++ translator/pngenerator.g 2009-06-17 22:08:28 UTC (rev 65) @@ -81,9 +81,13 @@ static pns pn; } : ID { + ASSOC_ARRAY* places; + ASSOC_ARRAY* trans; pANTLR3_LIST list = processes->get(processes, $ID.text->chars); $proc_definitions::proc = (process*) list->get(list, kPROC); -// pn = createpn("pnum tnum", *((int*) list->get(list, kNUM_PLACES)), *((int*) list->get(list, kNUM_TRANS))); + places = (ASSOC_ARRAY*) list->get(list, kPLACES); + trans = (ASSOC_ARRAY*) list->get(list, kTRANS); + pn = createpn("pnum tnum", (int) places->size(places), (int) trans->size(trans)); $proc_definitions::proc->pn = &pn; }; trans_defs Modified: translator/pngenerator.h =================================================================== --- translator/pngenerator.h 2009-06-17 21:14:16 UTC (rev 64) +++ translator/pngenerator.h 2009-06-17 22:08:28 UTC (rev 65) @@ -2,7 +2,7 @@ * This C header file was generated by $ANTLR version 3.1.2 * * - From the grammar source file : /Users/bion/projects/iordache/translator/pngenerator.g - * - On : 2009-06-17 16:11:12 + * - On : 2009-06-17 17:07:20 * - for the tree parser : pngeneratorTreeParser * * Editing it, at least manually, is not wise. * Modified: translator/pnscript.g =================================================================== --- translator/pnscript.g 2009-06-17 21:14:16 UTC (rev 64) +++ translator/pnscript.g 2009-06-17 22:08:28 UTC (rev 65) @@ -78,13 +78,15 @@ } : proc_declarations!+ proc_definitions+ { //make sure every process was defined -/* int i; + int i; pANTLR3_LIST list; process* proc; - char* key; - for(i = 0; i < procDeclarations->size(procDeclarations); i++) { - key = (char*) procDeclarations->get(procDeclarations, i); - list = (pANTLR3_LIST) processes->get(processes, key); + for(i = 0; i < processes->size(processes); i++) { + list = (pANTLR3_LIST) processes->iter(processes, i); + if(list == NULL) { + printf("List is null...:(\n"); + continue; + } proc = (process*) list->get(list, kPROC); if(proc->start) { proc->start = false; @@ -92,7 +94,7 @@ fprintf(stderr, "ERROR: Process \%s declared but not defined...?\n", (char*) list->get(list, kNAME)); exit(1); } - }*/ + } } proc_instantiations+ constraints* other_commands*; //------------------- proc_declarations Modified: translator/pnscriptLexer.c =================================================================== --- translator/pnscriptLexer.c 2009-06-17 21:14:16 UTC (rev 64) +++ translator/pnscriptLexer.c 2009-06-17 22:08:28 UTC (rev 65) @@ -2,7 +2,7 @@ * This C source file was generated by $ANTLR version 3.1.2 * * - From the grammar source file : /Users/bion/projects/iordache/translator/pnscript.g - * - On : 2009-06-17 16:10:42 + * - On : 2009-06-17 17:02:21 * - for the lexer : pnscriptLexerLexer * * Editing it, at least manually, is not wise. * @@ -1275,7 +1275,7 @@ } // $ANTLR end T__45 -// Comes from: 494:2: ( 'extern' ) +// Comes from: 496:2: ( 'extern' ) /** \brief Lexer rule generated by ANTLR3 * * $ANTLR start EXTERN @@ -1295,8 +1295,8 @@ _type = EXTERN; - // /Users/bion/projects/iordache/translator/pnscript.g:494:2: ( 'extern' ) - // /Users/bion/projects/iordache/translator/pnscript.g:494:4: 'extern' + // /Users/bion/projects/iordache/translator/pnscript.g:496:2: ( 'extern' ) + // /Users/bion/projects/iordache/translator/pnscript.g:496:4: 'extern' { MATCHS(lit_4); if (HASEXCEPTION()) @@ -1318,7 +1318,7 @@ } // $ANTLR end EXTERN -// Comes from: 496:2: ( 'process' ) +// Comes from: 498:2: ( 'process' ) /** \brief Lexer rule generated by ANTLR3 * * $ANTLR start PROCESS @@ -1338,8 +1338,8 @@ _type = PROCESS; - // /Users/bion/projects/iordache/translator/pnscript.g:496:2: ( 'process' ) - // /Users/bion/projects/iordache/translator/pnscript.g:496:4: 'process' + // /Users/bion/projects/iordache/translator/pnscript.g:498:2: ( 'process' ) + // /Users/bion/projects/iordache/translator/pnscript.g:498:4: 'process' { MATCHS(lit_5); if (HASEXCEPTION()) @@ -1361,7 +1361,7 @@ } // $ANTLR end PROCESS -// Comes from: 498:2: ( 'build' ':' ) +// Comes from: 500:2: ( 'build' ':' ) /** \brief Lexer rule generated by ANTLR3 * * $ANTLR start BUILD @@ -1381,8 +1381,8 @@ _type = BUILD; - // /Users/bion/projects/iordache/translator/pnscript.g:498:2: ( 'build' ':' ) - // /Users/bion/projects/iordache/translator/pnscript.g:498:4: 'build' ':' + // /Users/bion/projects/iordache/translator/pnscript.g:500:2: ( 'build' ':' ) + // /Users/bion/projects/iordache/translator/pnscript.g:500:4: 'build' ':' { MATCHS(lit_6); if (HASEXCEPTION()) @@ -1410,7 +1410,7 @@ } // $ANTLR end BUILD -// Comes from: 500:2: ( 'include' ':' ) +// Comes from: 502:2: ( 'include' ':' ) /** \brief Lexer rule generated by ANTLR3 * * $ANTLR start INCLUDE @@ -1430,8 +1430,8 @@ _type = INCLUDE; - // /Users/bion/projects/iordache/translator/pnscript.g:500:2: ( 'include' ':' ) - // /Users/bion/projects/iordache/translator/pnscript.g:500:4: 'include' ':' + // /Users/bion/projects/iordache/translator/pnscript.g:502:2: ( 'include' ':' ) + // /Users/bion/projects/iordache/translator/pnscript.g:502:4: 'include' ':' { MATCHS(lit_7); if (HASEXCEPTION()) @@ -1459,7 +1459,7 @@ } // $ANTLR end INCLUDE -// Comes from: 503:2: ( '.PN:' ) +// Comes from: 505:2: ( '.PN:' ) /** \brief Lexer rule generated by ANTLR3 * * $ANTLR start PNDEF @@ -1479,8 +1479,8 @@ _type = PNDEF; - // /Users/bion/projects/iordache/translator/pnscript.g:503:2: ( '.PN:' ) - // /Users/bion/projects/iordache/translator/pnscript.g:503:4: '.PN:' + // /Users/bion/projects/iordache/translator/pnscript.g:505:2: ( '.PN:' ) + // /Users/bion/projects/iordache/translator/pnscript.g:505:4: '.PN:' { MATCHS(lit_8); if (HASEXCEPTION()) @@ -1502,7 +1502,7 @@ } // $ANTLR end PNDEF -// Comes from: 505:2: ( 'places' ':' ) +// Comes from: 507:2: ( 'places' ':' ) /** \brief Lexer rule generated by ANTLR3 * * $ANTLR start PLACES @@ -1522,8 +1522,8 @@ _type = PLACES; - // /Users/bion/projects/iordache/translator/pnscript.g:505:2: ( 'places' ':' ) - // /Users/bion/projects/iordache/translator/pnscript.g:505:4: 'places' ':' + // /Users/bion/projects/iordache/translator/pnscript.g:507:2: ( 'places' ':' ) + // /Users/bion/projects/iordache/translator/pnscript.g:507:4: 'places' ':' { MATCHS(lit_9); if (HASEXCEPTION()) @@ -1551,7 +1551,7 @@ } // $ANTLR end PLACES -// Comes from: 507:2: ( 'trans' ( 'itions' )? ':' ) +// Comes from: 509:2: ( 'trans' ( 'itions' )? ':' ) /** \brief Lexer rule generated by ANTLR3 * * $ANTLR start TRANS @@ -1571,8 +1571,8 @@ _type = TRANS; - // /Users/bion/projects/iordache/translator/pnscript.g:507:2: ( 'trans' ( 'itions' )? ':' ) - // /Users/bion/projects/iordache/translator/pnscript.g:507:4: 'trans' ( 'itions' )? ':' + // /Users/bion/projects/iordache/translator/pnscript.g:509:2: ( 'trans' ( 'itions' )? ':' ) + // /Users/bion/projects/iordache/translator/pnscript.g:509:4: 'trans' ( 'itions' )? ':' { MATCHS(lit_10); if (HASEXCEPTION()) @@ -1582,7 +1582,7 @@ - // /Users/bion/projects/iordache/translator/pnscript.g:507:12: ( 'itions' )? + // /Users/bion/projects/iordache/translator/pnscript.g:509:12: ( 'itions' )? { int alt1=2; { @@ -1595,7 +1595,7 @@ switch (alt1) { case 1: - // /Users/bion/projects/iordache/translator/pnscript.g:507:12: 'itions' + // /Users/bion/projects/iordache/translator/pnscript.g:509:12: 'itions' { MATCHS(lit_11); if (HASEXCEPTION()) @@ -1629,7 +1629,7 @@ } // $ANTLR end TRANS -// Comes from: 509:2: ( '.code:' ) +// Comes from: 511:2: ( '.code:' ) /** \brief Lexer rule generated by ANTLR3 * * $ANTLR start CODE @@ -1649,8 +1649,8 @@ _type = CODE; - // /Users/bion/projects/iordache/translator/pnscript.g:509:2: ( '.code:' ) - // /Users/bion/projects/iordache/translator/pnscript.g:509:4: '.code:' + // /Users/bion/projects/iordache/translator/pnscript.g:511:2: ( '.code:' ) + // /Users/bion/projects/iordache/translator/pnscript.g:511:4: '.code:' { MATCHS(lit_12); if (HASEXCEPTION()) @@ -1672,7 +1672,7 @@ } // $ANTLR end CODE -// Comes from: 511:2: ( 'select function' ) +// Comes from: 513:2: ( 'select function' ) /** \brief Lexer rule generated by ANTLR3 * * $ANTLR start SELECT_DEF @@ -1692,8 +1692,8 @@ _type = SELECT_DEF; - // /Users/bion/projects/iordache/translator/pnscript.g:511:2: ( 'select function' ) - // /Users/bion/projects/iordache/translator/pnscript.g:511:4: 'select function' + // /Users/bion/projects/iordache/translator/pnscript.g:513:2: ( 'select function' ) + // /Users/bion/projects/iordache/translator/pnscript.g:513:4: 'select function' { MATCHS(lit_13); if (HASEXCEPTION()) @@ -1715,7 +1715,7 @@ } // $ANTLR end SELECT_DEF -// Comes from: 514:2: ( 'sync' ) +// Comes from: 516:2: ( 'sync' ) /** \brief Lexer rule generated by ANTLR3 * * $ANTLR start SYNC_TOK @@ -1735,8 +1735,8 @@ _type = SYNC_TOK; - // /Users/bion/projects/iordache/translator/pnscript.g:514:2: ( 'sync' ) - // /Users/bion/projects/iordache/translator/pnscript.g:514:4: 'sync' + // /Users/bion/projects/iordache/translator/pnscript.g:516:2: ( 'sync' ) + // /Users/bion/projects/iordache/translator/pnscript.g:516:4: 'sync' { MATCHS(lit_14); if (HASEXCEPTION()) @@ -1758,7 +1758,7 @@ } // $ANTLR end SYNC_TOK -// Comes from: 516:2: ( 'start' ) +// Comes from: 518:2: ( 'start' ) /** \brief Lexer rule generated by ANTLR3 * * $ANTLR start START @@ -1778,8 +1778,8 @@ _type = START; - // /Users/bion/projects/iordache/translator/pnscript.g:516:2: ( 'start' ) - // /Users/bion/projects/iordache/translator/pnscript.g:516:4: 'start' + // /Users/bion/projects/iordache/translator/pnscript.g:518:2: ( 'start' ) + // /Users/bion/projects/iordache/translator/pnscript.g:518:4: 'start' { MATCHS(lit_15); if (HASEXCEPTION()) @@ -1801,7 +1801,7 @@ } // $ANTLR end START -// Comes from: 519:2: ( '.constraints:' ) +// Comes from: 521:2: ( '.constraints:' ) /** \brief Lexer rule generated by ANTLR3 * * $ANTLR start CONSTRAINTS @@ -1821,8 +1821,8 @@ _type = CONSTRAINTS; - // /Users/bion/projects/iordache/translator/pnscript.g:519:2: ( '.constraints:' ) - // /Users/bion/projects/iordache/translator/pnscript.g:519:4: '.constraints:' + // /Users/bion/projects/iordache/translator/pnscript.g:521:2: ( '.constraints:' ) + // /Users/bion/projects/iordache/translator/pnscript.g:521:4: '.constraints:' { MATCHS(lit_16); if (HASEXCEPTION()) @@ -1844,7 +1844,7 @@ } // $ANTLR end CONSTRAINTS -// Comes from: 521:2: ( '||' | '&&' | 'or' | 'OR' | 'and' | 'AND' ) +// Comes from: 523:2: ( '||' | '&&' | 'or' | 'OR' | 'and' | 'AND' ) /** \brief Lexer rule generated by ANTLR3 * * $ANTLR start EQS_OP @@ -1865,7 +1865,7 @@ { - // /Users/bion/projects/iordache/translator/pnscript.g:521:2: ( '||' | '&&' | 'or' | 'OR' | 'and' | 'AND' ) + // /Users/bion/projects/iordache/translator/pnscript.g:523:2: ( '||' | '&&' | 'or' | 'OR' | 'and' | 'AND' ) ANTLR3_UINT32 alt2; @@ -1918,7 +1918,7 @@ switch (alt2) { case 1: - // /Users/bion/projects/iordache/translator/pnscript.g:521:4: '||' + // /Users/bion/projects/iordache/translator/pnscript.g:523:4: '||' { MATCHS(lit_17); if (HASEXCEPTION()) @@ -1931,7 +1931,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pnscript.g:521:9: '&&' + // /Users/bion/projects/iordache/translator/pnscript.g:523:9: '&&' { MATCHS(lit_18); if (HASEXCEPTION()) @@ -1944,7 +1944,7 @@ } break; case 3: - // /Users/bion/projects/iordache/translator/pnscript.g:521:14: 'or' + // /Users/bion/projects/iordache/translator/pnscript.g:523:14: 'or' { MATCHS(lit_19); if (HASEXCEPTION()) @@ -1957,7 +1957,7 @@ } break; case 4: - // /Users/bion/projects/iordache/translator/pnscript.g:521:19: 'OR' + // /Users/bion/projects/iordache/translator/pnscript.g:523:19: 'OR' { MATCHS(lit_20); if (HASEXCEPTION()) @@ -1970,7 +1970,7 @@ } break; case 5: - // /Users/bion/projects/iordache/translator/pnscript.g:521:24: 'and' + // /Users/bion/projects/iordache/translator/pnscript.g:523:24: 'and' { MATCHS(lit_21); if (HASEXCEPTION()) @@ -1983,7 +1983,7 @@ } break; case 6: - // /Users/bion/projects/iordache/translator/pnscript.g:521:30: 'AND' + // /Users/bion/projects/iordache/translator/pnscript.g:523:30: 'AND' { MATCHS(lit_22); if (HASEXCEPTION()) @@ -2008,7 +2008,7 @@ } // $ANTLR end EQS_OP -// Comes from: 523:2: ( '<' | '<=' | '=' | '!=' | '>=' | '>' ) +// Comes from: 525:2: ( '<' | '<=' | '=' | '!=' | '>=' | '>' ) /** \brief Lexer rule generated by ANTLR3 * * $ANTLR start EQ_OP @@ -2029,7 +2029,7 @@ { - // /Users/bion/projects/iordache/translator/pnscript.g:523:2: ( '<' | '<=' | '=' | '!=' | '>=' | '>' ) + // /Users/bion/projects/iordache/translator/pnscript.g:525:2: ( '<' | '<=' | '=' | '!=' | '>=' | '>' ) ANTLR3_UINT32 alt3; @@ -2092,7 +2092,7 @@ switch (alt3) { case 1: - // /Users/bion/projects/iordache/translator/pnscript.g:523:4: '<' + // /Users/bion/projects/iordache/translator/pnscript.g:525:4: '<' { MATCHC('<'); if (HASEXCEPTION()) @@ -2104,7 +2104,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pnscript.g:523:8: '<=' + // /Users/bion/projects/iordache/translator/pnscript.g:525:8: '<=' { MATCHS(lit_23); if (HASEXCEPTION()) @@ -2117,7 +2117,7 @@ } break; case 3: - // /Users/bion/projects/iordache/translator/pnscript.g:523:13: '=' + // /Users/bion/projects/iordache/translator/pnscript.g:525:13: '=' { MATCHC('='); if (HASEXCEPTION()) @@ -2129,7 +2129,7 @@ } break; case 4: - // /Users/bion/projects/iordache/translator/pnscript.g:523:17: '!=' + // /Users/bion/projects/iordache/translator/pnscript.g:525:17: '!=' { MATCHS(lit_24); if (HASEXCEPTION()) @@ -2142,7 +2142,7 @@ } break; case 5: - // /Users/bion/projects/iordache/translator/pnscript.g:523:22: '>=' + // /Users/bion/projects/iordache/translator/pnscript.g:525:22: '>=' { MATCHS(lit_25); if (HASEXCEPTION()) @@ -2155,7 +2155,7 @@ } break; case 6: - // /Users/bion/projects/iordache/translator/pnscript.g:523:27: '>' + // /Users/bion/projects/iordache/translator/pnscript.g:525:27: '>' { MATCHC('>'); if (HASEXCEPTION()) @@ -2179,7 +2179,7 @@ } // $ANTLR end EQ_OP -// Comes from: 525:2: ( '*' ) +// Comes from: 527:2: ( '*' ) /** \brief Lexer rule generated by ANTLR3 * * $ANTLR start MULT @@ -2199,8 +2199,8 @@ _type = MULT; - // /Users/bion/projects/iordache/translator/pnscript.g:525:2: ( '*' ) - // /Users/bion/projects/iordache/translator/pnscript.g:525:4: '*' + // /Users/bion/projects/iordache/translator/pnscript.g:527:2: ( '*' ) + // /Users/bion/projects/iordache/translator/pnscript.g:527:4: '*' { MATCHC('*'); if (HASEXCEPTION()) @@ -2221,7 +2221,7 @@ } // $ANTLR end MULT -// Co... [truncated message content] |
From: <the...@us...> - 2009-06-17 21:14:23
|
Revision: 64 http://pntool.svn.sourceforge.net/pntool/?rev=64&view=rev Author: thecodeweasel Date: 2009-06-17 21:14:16 +0000 (Wed, 17 Jun 2009) Log Message: ----------- Implemented a primitive associative array structure Temporarily dropped functionality added in r62 Transitioned code to use associative arrays instead of hash tables Modified Paths: -------------- translator/Makefile translator/main.c translator/pngenerator.c translator/pngenerator.g translator/pngenerator.h translator/pnscript.g translator/pnscriptLexer.c translator/pnscriptLexer.h translator/pnscriptParser.c translator/pnscriptParser.h Added Paths: ----------- translator/dataStructures.c translator/dataStructures.h Modified: translator/Makefile =================================================================== --- translator/Makefile 2009-06-17 20:56:13 UTC (rev 63) +++ translator/Makefile 2009-06-17 21:14:16 UTC (rev 64) @@ -1,17 +1,20 @@ COMPILER=gcc -g INCLUDES=-iquote../pnheaders -Iclibs -Iclibs/include -pnscript : main.o pnscriptParser.o pnscriptLexer.o pncompactor.o pngenerator.o - $(COMPILER) -o pnscript main.o pnscriptParser.o pnscriptLexer.o pncompactor.o pngenerator.o ../pnheaders/*.o clibs/*.o +pnscript : dataStructures.o main.o pnscriptParser.o pnscriptLexer.o pncompactor.o pngenerator.o + $(COMPILER) -o pnscript dataStructures.o main.o pnscriptParser.o pnscriptLexer.o pncompactor.o pngenerator.o ../pnheaders/*.o clibs/*.o #Make external libraries here (if necessary) #patch the source BEFORE building it! -main.o : main.c treeparser.h +dataStructures.o : dataStructures.h #If the patch has already been applied it will fail. #This fixes the problem as quietly as possible patch -Ns -p0 < clibs.patch || true if ! test -e clibs/Makefile; then cd clibs; ./configure --silent; make --silent; fi if ! test -e ../pnheaders/pns.o; then cd ../pnheaders; make --silent; fi + $(COMPILER) -c dataStructures.c $(INCLUDES) + +main.o : main.c treeparser.h $(COMPILER) -c main.c $(INCLUDES) pnscriptParser.o : pnscriptParser.h Added: translator/dataStructures.c =================================================================== --- translator/dataStructures.c (rev 0) +++ translator/dataStructures.c 2009-06-17 21:14:16 UTC (rev 64) @@ -0,0 +1,122 @@ +#include <stdbool.h> +#include "dataStructures.h" +#include "general.h" + +//ints are 4 bytes wide, chars are 1 byte wide +static void arrayDelete (ASSOC_ARRAY* array, void* key); +static void* arrayRemove (ASSOC_ARRAY* array, void* key); +static void* arrayGet (ASSOC_ARRAY* array, void* key); +static ANTLR3_INT32 arrayAdd (ASSOC_ARRAY* array, void* key, void* element, void (ANTLR3_CDECL* freeptr)(void*)); +static ANTLR3_UINT32 arraySet (ASSOC_ARRAY* array, ANTLR3_UINT32 key, void* element, void (ANTLR3_CDECL* freeptr)(void*)); +static void arrayFree (ASSOC_ARRAY* array); +static ANTLR3_UINT32 arraySize (ASSOC_ARRAY* array); + +ASSOC_ARRAY* newAssocArray(ANTLR3_UINT32 sizeHint) { + ASSOC_ARRAY* ret; + pANTLR3_VECTOR_FACTORY factory; + ret = tmalloc(sizeof(ASSOC_ARRAY)); + + ret->table = antlr3HashTableNew(sizeHint); + factory = antlr3VectorFactoryNew(sizeHint); + ret->list = factory->newVector(factory); + + ret->del = arrayDelete; + ret->remove = arrayRemove; + ret->get = arrayGet; + ret->add = arrayAdd; + ret->set = arraySet; + ret->free = arrayFree; + ret->size = arraySize; + + return ret; +} + +bool isInt(void* key) { + if(sizeof(*key) == 4) + return true; + return false; +} + +void arrayDelete(ASSOC_ARRAY* array, void* key) { + if(isInt(key)) { + char* strKey; + strKey = (char*) array->list->get(array->list, *((int*)key)); + array->list->del(array->list, *((int*)key)); + array->table->del(array->table, strKey); + } else { + int intKey; + intKey = *((int*) array->table->get(array->table, (char*) key)); + array->list->del(array->list, intKey); + array->table->del(array->table, (char*) key); + } +} + +void* arrayRemove(ASSOC_ARRAY* array, void* key) { + void* ret; + if(isInt(key)) { + char* strKey; + strKey = (char*) array->list->get(array->list, *((int*)key)); + array->list->del(array->list, *((int*)key)); + ret = array->table->remove(array->table, strKey); + } else { + int intKey; + intKey = *((int*) array->table->get(array->table, (char*) key)); + array->list->del(array->list, intKey); + ret = array->table->remove(array->table, (char*) key); + } + return ret; +} + +void* arrayGet(ASSOC_ARRAY* array, void* key) { + void* ret; + if(isInt(key)) { + char* strKey; + strKey = (char*) array->list->get(array->list, *((int*)key)); + ret = array->table->get(array->table, strKey); + } else { + ret = array->table->get(array->table, (char*) key); + } + return ret; +} + +ANTLR3_INT32 arrayAdd(ASSOC_ARRAY* array, void* key, void* element, void (ANTLR3_CDECL* freeptr)(void*)) { + ANTLR3_INT32 ret; + char* strKey; + strKey = (char*) key; + //ALWAYS free from the hash table + array->table->put(array->table, strKey, element, freeptr); + array->list->add(array->list, strKey, NULL); + return ret; +} + +ANTLR3_UINT32 arraySet(ASSOC_ARRAY* array, ANTLR3_UINT32 key, void* element, void (ANTLR3_CDECL* freeptr)(void*)) { + ANTLR3_UINT32 ret; + char* strKey; + static int intKey; + + if(isInt((void*) key)) { + intKey = *((int*) key); + strKey = (char*) array->list->get(array->list, intKey); + } else { + int i; + strKey = (char*) key; + for(i = 0; i < array->list->size(array->list); i++) { + if(strcmp((char*) array->list->get(array->list, i), strKey)) { + intKey = i; + break; + } + } + } + array->list->set(array->list, intKey, strKey, NULL, false); + ret = array->table->put(array->table, strKey, element, freeptr); + return ret; +} + +void arrayFree(ASSOC_ARRAY* array) { + array->table->free(array->table); array->table = NULL; + array->list->free(array->list); array->list = NULL; +} + +ANTLR3_UINT32 arraySize(ASSOC_ARRAY* array) { + return array->list->size(array->list); +} \ No newline at end of file Property changes on: translator/dataStructures.c ___________________________________________________________________ Added: svn:eol-style + native Added: translator/dataStructures.h =================================================================== --- translator/dataStructures.h (rev 0) +++ translator/dataStructures.h 2009-06-17 21:14:16 UTC (rev 64) @@ -0,0 +1,29 @@ +#ifndef DATASTRUCTURES_H +#define DATASTRUCTURES_H + +#include <antlr3.h> + +/** Hash table with a vector + * The speed of hash table lookups with the ability to iterate over the data + */ +typedef struct ASSOC_ARRAY_struct +{ + pANTLR3_HASH_TABLE table; + //the list just enumerates the table keys + pANTLR3_VECTOR list; + + /** Pointer to function to completely delete everything + */ + void (*free) (struct ASSOC_ARRAY_struct* array); + + //ints are 4 bytes wide, chars are 1 byte wide + void (*del) (struct ASSOC_ARRAY_struct* array, void* key); + void* (*remove) (struct ASSOC_ARRAY_struct* array, void* key); + void* (*get) (struct ASSOC_ARRAY_struct* array, void* key); + ANTLR3_INT32 (*add) (struct ASSOC_ARRAY_struct* array, void* key, void* element, void (ANTLR3_CDECL* freeptr)(void*)); + ANTLR3_UINT32 (*set) (struct ASSOC_ARRAY_struct* array, ANTLR3_UINT32 key, void* element, void (ANTLR3_CDECL* freeptr)(void*)); + //based off the vector size to ensure iterating never goes awry + ANTLR3_UINT32 (*size) (struct ASSOC_ARRAY_struct* array); +} ASSOC_ARRAY; + +#endif \ No newline at end of file Property changes on: translator/dataStructures.h ___________________________________________________________________ Added: svn:eol-style + native Modified: translator/main.c =================================================================== --- translator/main.c 2009-06-17 20:56:13 UTC (rev 63) +++ translator/main.c 2009-06-17 21:14:16 UTC (rev 64) @@ -34,6 +34,7 @@ // #include "treeparser.h" #include <time.h> +#include "dataStructures.h" // Main entry point for this example // @@ -117,8 +118,8 @@ time_t start; time_t end; - pANTLR3_HASH_TABLE processes; - pANTLR3_HASH_TABLE threads; + ASSOC_ARRAY* processes; + ASSOC_ARRAY* threads; // Create the input stream based upon the argument supplied to us on the command line // for this example, the input will always default to ./input if there is no explicit @@ -212,8 +213,8 @@ // time(&start); - processes = antlr3HashTableNew(32); - threads = antlr3HashTableNew(256); + processes = (ASSOC_ARRAY*) newAssocArray(32); + threads = (ASSOC_ARRAY*) newAssocArray(256); printf("Parsing input spec...\n"); pnscriptAST = psr->pn(psr, tstream, processes, threads); Modified: translator/pngenerator.c =================================================================== --- translator/pngenerator.c 2009-06-17 20:56:13 UTC (rev 63) +++ translator/pngenerator.c 2009-06-17 21:14:16 UTC (rev 64) @@ -2,7 +2,7 @@ * This C source file was generated by $ANTLR version 3.1.2 * * - From the grammar source file : /Users/bion/projects/iordache/translator/pngenerator.g - * - On : 2009-06-16 21:49:36 + * - On : 2009-06-17 16:11:12 * - for the tree parser : pngeneratorTreeParser * * Editing it, at least manually, is not wise. * @@ -46,11 +46,16 @@ //this will bring in everything else we need from the PNS library #include "pns.h" + #include "dataStructures.h" #undef GET_TOKEN #undef GET_TEXT #undef WARN_AT #undef FAIL_AT + #undef kNAME + #undef kPROC + #undef kPLACES + #undef kTRANS #define GET_TOKEN(list, num) (pANTLR3_COMMON_TOKEN) list->get(list, num) //retrieves the text of the numth token in the list @@ -63,8 +68,6 @@ #define kPROC 2 #define kPLACES 3 #define kTRANS 4 - #define kNUM_PLACES 5 - #define kNUM_TRANS 6 /* End of Header action. * ============================================================================= @@ -377,7 +380,7 @@ // Forward declare the locally static matching functions we have generated. // -static void pn (ppngenerator ctx, pANTLR3_HASH_TABLE procData, pANTLR3_HASH_TABLE threadData); +static void pn (ppngenerator ctx, ASSOC_ARRAY* procData, ASSOC_ARRAY* threadData); static void proc_definitions (ppngenerator ctx); static void def_start (ppngenerator ctx); static void trans_defs (ppngenerator ctx); @@ -571,14 +574,12 @@ static void showContext(pANTLR3_BASE_TREE tree); - static void addPlace(pANTLR3_HASH_TABLE placeList, void* place); - static void addTrans(pANTLR3_HASH_TABLE transList, void* trans); static void deallocProcess(process* proc); //see kDEFINES in pnscript.g - pANTLR3_HASH_TABLE processes; + ASSOC_ARRAY* processes; //see kDEFINES in pnscript.g - pANTLR3_HASH_TABLE threads; + ASSOC_ARRAY* threads; specs* specification; static void showContext(pANTLR3_BASE_TREE t) { @@ -586,20 +587,6 @@ fprintf(stderr, "Line %i, character %i\n", tok->getLine(tok), tok->getCharPositionInLine(tok)); } - static void addPlace(pANTLR3_HASH_TABLE placeList, void* place) { - static unsigned int* i; - i = tmalloc(sizeof(int)); - *i = placeList->size(placeList); - placeList->put(placeList, (char*) place, i, free); - } - - static void addTrans(pANTLR3_HASH_TABLE transList, void* trans) { - static unsigned int* i; - i = tmalloc(sizeof(int)); - *i = transList->size(transList); - transList->put(transList, (char*) trans, i, free); - } - static void deallocProcess(process* proc) { if(proc->pn != NULL) { deallocpn(proc->pn); @@ -902,7 +889,7 @@ * DFA tables for the parser */ /** Static dfa state tables for Cyclic dfa: - * ()+ loopback of 85:22: ( proc_instantiations )+ + * ()+ loopback of 72:22: ( proc_instantiations )+ */ static const ANTLR3_INT32 dfa2_eot[8] = { @@ -1018,7 +1005,7 @@ } CONSTRUCTEX(); EXCEPTION->type = ANTLR3_NO_VIABLE_ALT_EXCEPTION; - EXCEPTION->message = (void *)"()+ loopback of 85:22: ( proc_instantiations )+"; + EXCEPTION->message = (void *)"()+ loopback of 72:22: ( proc_instantiations )+"; EXCEPTION->decisionNum = 2; EXCEPTION->state = _s; return -1; @@ -1031,7 +1018,7 @@ = { 2, /* Decision number of this dfa */ /* Which decision this represents: */ - (const pANTLR3_UCHAR)"()+ loopback of 85:22: ( proc_instantiations )+", + (const pANTLR3_UCHAR)"()+ loopback of 72:22: ( proc_instantiations )+", (CDFA_SPECIAL_FUNC) dfa2_sst, antlr3dfaspecialTransition, /* DFA specialTransition is currently just a default function in the runtime */ antlr3dfapredict, /* DFA simulator function is in the runtime */ @@ -1056,10 +1043,10 @@ */ /** * $ANTLR start pn - * /Users/bion/projects/iordache/translator/pngenerator.g:75:1: pn[pANTLR3_HASH_TABLE procData, pANTLR3_HASH_TABLE threadData] : ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )* ; + * /Users/bion/projects/iordache/translator/pngenerator.g:62:1: pn[ASSOC_ARRAY* procData, ASSOC_ARRAY* threadData] : ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )* ; */ static void -pn(ppngenerator ctx, pANTLR3_HASH_TABLE procData, pANTLR3_HASH_TABLE threadData) +pn(ppngenerator ctx, ASSOC_ARRAY* procData, ASSOC_ARRAY* threadData) { /* Initialize rule variables */ @@ -1072,10 +1059,10 @@ specification = tmalloc(sizeof(specs)); { - // /Users/bion/projects/iordache/translator/pngenerator.g:85:2: ( ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )* ) - // /Users/bion/projects/iordache/translator/pngenerator.g:85:4: ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )* + // /Users/bion/projects/iordache/translator/pngenerator.g:72:2: ( ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )* ) + // /Users/bion/projects/iordache/translator/pngenerator.g:72:4: ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )* { - // /Users/bion/projects/iordache/translator/pngenerator.g:85:4: ( proc_definitions )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:72:4: ( proc_definitions )+ { int cnt1=0; @@ -1168,7 +1155,7 @@ } loop1: ; /* Jump to here if this rule does not match */ } - // /Users/bion/projects/iordache/translator/pngenerator.g:85:22: ( proc_instantiations )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:72:22: ( proc_instantiations )+ { int cnt2=0; @@ -1230,7 +1217,7 @@ loop2: ; /* Jump to here if this rule does not match */ } - // /Users/bion/projects/iordache/translator/pngenerator.g:85:43: ( constraints )* + // /Users/bion/projects/iordache/translator/pngenerator.g:72:43: ( constraints )* for (;;) { @@ -1274,7 +1261,7 @@ loop3: ; /* Jump out to here if this rule does not match */ - // /Users/bion/projects/iordache/translator/pngenerator.g:85:56: ( other_commands )* + // /Users/bion/projects/iordache/translator/pngenerator.g:72:56: ( other_commands )* for (;;) { @@ -1349,7 +1336,7 @@ /** * $ANTLR start proc_definitions - * /Users/bion/projects/iordache/translator/pngenerator.g:87:1: proc_definitions : ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:74:1: proc_definitions : ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) ; */ static void proc_definitions(ppngenerator ctx) @@ -1359,8 +1346,8 @@ ctx->ppngenerator_proc_definitionsTop = ppngenerator_proc_definitionsPush(ctx); { - // /Users/bion/projects/iordache/translator/pngenerator.g:91:2: ( ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:91:4: ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) + // /Users/bion/projects/iordache/translator/pngenerator.g:78:2: ( ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:78:4: ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) { FOLLOWPUSH(FOLLOW_def_start_in_proc_definitions102); def_start(ctx); @@ -1390,7 +1377,7 @@ return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:91:16: ( trans_defs )* + // /Users/bion/projects/iordache/translator/pngenerator.g:78:16: ( trans_defs )* for (;;) { @@ -1436,7 +1423,7 @@ loop5: ; /* Jump out to here if this rule does not match */ - // /Users/bion/projects/iordache/translator/pngenerator.g:91:28: ( select_functions )* + // /Users/bion/projects/iordache/translator/pngenerator.g:78:28: ( select_functions )* for (;;) { @@ -1482,7 +1469,7 @@ loop6: ; /* Jump out to here if this rule does not match */ - // /Users/bion/projects/iordache/translator/pngenerator.g:91:46: ( nondeterm )? + // /Users/bion/projects/iordache/translator/pngenerator.g:78:46: ( nondeterm )? { int alt7=2; { @@ -1555,7 +1542,7 @@ /** * $ANTLR start def_start - * /Users/bion/projects/iordache/translator/pngenerator.g:92:1: def_start : ID ; + * /Users/bion/projects/iordache/translator/pngenerator.g:79:1: def_start : ID ; */ static void def_start(ppngenerator ctx) @@ -1572,8 +1559,8 @@ ID1 = NULL; { - // /Users/bion/projects/iordache/translator/pngenerator.g:96:2: ( ID ) - // /Users/bion/projects/iordache/translator/pngenerator.g:96:4: ID + // /Users/bion/projects/iordache/translator/pngenerator.g:83:2: ( ID ) + // /Users/bion/projects/iordache/translator/pngenerator.g:83:4: ID { ID1 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_def_start126); if (HASEXCEPTION()) @@ -1589,7 +1576,7 @@ pANTLR3_LIST list = processes->get(processes, (ID1->getText(ID1))->chars); (SCOPE_TOP(proc_definitions))->proc= (process*) list->get(list, kPROC); - pn = createpn("pnum tnum", *((int*) list->get(list, kNUM_PLACES)), *((int*) list->get(list, kNUM_TRANS))); + // pn = createpn("pnum tnum", *((int*) list->get(list, kNUM_PLACES)), *((int*) list->get(list, kNUM_TRANS))); (SCOPE_TOP(proc_definitions))->proc->pn = &pn; } @@ -1616,7 +1603,7 @@ /** * $ANTLR start trans_defs - * /Users/bion/projects/iordache/translator/pngenerator.g:102:1: trans_defs : ( extern_trans_def | trans_def ); + * /Users/bion/projects/iordache/translator/pngenerator.g:89:1: trans_defs : ( extern_trans_def | trans_def ); */ static void trans_defs(ppngenerator ctx) @@ -1627,7 +1614,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:103:2: ( extern_trans_def | trans_def ) + // /Users/bion/projects/iordache/translator/pngenerator.g:90:2: ( extern_trans_def | trans_def ) ANTLR3_UINT32 alt8; @@ -1665,7 +1652,7 @@ switch (alt8) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:103:4: extern_trans_def + // /Users/bion/projects/iordache/translator/pngenerator.g:90:4: extern_trans_def { FOLLOWPUSH(FOLLOW_extern_trans_def_in_trans_defs136); extern_trans_def(ctx); @@ -1683,7 +1670,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:104:4: trans_def + // /Users/bion/projects/iordache/translator/pngenerator.g:91:4: trans_def { FOLLOWPUSH(FOLLOW_trans_def_in_trans_defs141); trans_def(ctx); @@ -1723,7 +1710,7 @@ /** * $ANTLR start extern_trans_def - * /Users/bion/projects/iordache/translator/pngenerator.g:105:1: extern_trans_def : ( ^( TO ( ID )+ ) | ^( FROM ( ID )+ ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:92:1: extern_trans_def : ( ^( TO ( ID )+ ) | ^( FROM ( ID )+ ) ); */ static void extern_trans_def(ppngenerator ctx) @@ -1734,7 +1721,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:106:2: ( ^( TO ( ID )+ ) | ^( FROM ( ID )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:93:2: ( ^( TO ( ID )+ ) | ^( FROM ( ID )+ ) ) ANTLR3_UINT32 alt11; @@ -1772,7 +1759,7 @@ switch (alt11) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:106:4: ^( TO ( ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:93:4: ^( TO ( ID )+ ) { MATCHT(TO, &FOLLOW_TO_in_extern_trans_def151); if (HASEXCEPTION()) @@ -1793,7 +1780,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:106:9: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:93:9: ( ID )+ { int cnt9=0; @@ -1866,7 +1853,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:107:4: ^( FROM ( ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:94:4: ^( FROM ( ID )+ ) { MATCHT(FROM, &FOLLOW_FROM_in_extern_trans_def161); if (HASEXCEPTION()) @@ -1887,7 +1874,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:107:11: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:94:11: ( ID )+ { int cnt10=0; @@ -1982,7 +1969,7 @@ /** * $ANTLR start trans_def - * /Users/bion/projects/iordache/translator/pngenerator.g:108:1: trans_def : ( ^( ID CODE_BLOCK ) | ^( ID ( ID )+ ( CODE_BLOCK )? ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:95:1: trans_def : ( ^( ID CODE_BLOCK ) | ^( ID ( ID )+ ( CODE_BLOCK )? ) ); */ static void trans_def(ppngenerator ctx) @@ -1993,7 +1980,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:109:2: ( ^( ID CODE_BLOCK ) | ^( ID ( ID )+ ( CODE_BLOCK )? ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:96:2: ( ^( ID CODE_BLOCK ) | ^( ID ( ID )+ ( CODE_BLOCK )? ) ) ANTLR3_UINT32 alt14; @@ -2079,7 +2066,7 @@ switch (alt14) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:109:4: ^( ID CODE_BLOCK ) + // /Users/bion/projects/iordache/translator/pngenerator.g:96:4: ^( ID CODE_BLOCK ) { MATCHT(ID, &FOLLOW_ID_in_trans_def175); if (HASEXCEPTION()) @@ -2123,7 +2110,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:110:4: ^( ID ( ID )+ ( CODE_BLOCK )? ) + // /Users/bion/projects/iordache/translator/pngenerator.g:97:4: ^( ID ( ID )+ ( CODE_BLOCK )? ) { MATCHT(ID, &FOLLOW_ID_in_trans_def184); if (HASEXCEPTION()) @@ -2144,7 +2131,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:110:9: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:97:9: ( ID )+ { int cnt12=0; @@ -2204,7 +2191,7 @@ loop12: ; /* Jump to here if this rule does not match */ } - // /Users/bion/projects/iordache/translator/pngenerator.g:110:13: ( CODE_BLOCK )? + // /Users/bion/projects/iordache/translator/pngenerator.g:97:13: ( CODE_BLOCK )? { int alt13=2; { @@ -2270,7 +2257,7 @@ /** * $ANTLR start select_functions - * /Users/bion/projects/iordache/translator/pngenerator.g:111:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:98:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ; */ static void select_functions(ppngenerator ctx) @@ -2280,8 +2267,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:112:2: ( ^( SELECT_DEF ID CODE_BLOCK ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:112:4: ^( SELECT_DEF ID CODE_BLOCK ) + // /Users/bion/projects/iordache/translator/pngenerator.g:99:2: ( ^( SELECT_DEF ID CODE_BLOCK ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:99:4: ^( SELECT_DEF ID CODE_BLOCK ) { MATCHT(SELECT_DEF, &FOLLOW_SELECT_DEF_in_select_functions200); if (HASEXCEPTION()) @@ -2353,7 +2340,7 @@ /** * $ANTLR start nondeterm - * /Users/bion/projects/iordache/translator/pngenerator.g:113:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:100:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ; */ static void nondeterm(ppngenerator ctx) @@ -2363,8 +2350,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:114:2: ( ^( 'nondeterministic places: ' ( ID )+ ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:114:4: ^( 'nondeterministic places: ' ( ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:101:2: ( ^( 'nondeterministic places: ' ( ID )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:101:4: ^( 'nondeterministic places: ' ( ID )+ ) { MATCHT(44, &FOLLOW_44_in_nondeterm215); if (HASEXCEPTION()) @@ -2385,7 +2372,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:114:34: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:101:34: ( ID )+ { int cnt15=0; @@ -2477,7 +2464,7 @@ /** * $ANTLR start proc_instantiations - * /Users/bion/projects/iordache/translator/pngenerator.g:116:1: proc_instantiations : ( proc_init | sync_def | proc_start ); + * /Users/bion/projects/iordache/translator/pngenerator.g:103:1: proc_instantiations : ( proc_init | sync_def | proc_start ); */ static void proc_instantiations(ppngenerator ctx) @@ -2488,7 +2475,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:117:2: ( proc_init | sync_def | proc_start ) + // /Users/bion/projects/iordache/translator/pngenerator.g:104:2: ( proc_init | sync_def | proc_start ) ANTLR3_UINT32 alt16; @@ -2531,7 +2518,7 @@ switch (alt16) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:117:4: proc_init + // /Users/bion/projects/iordache/translator/pngenerator.g:104:4: proc_init { FOLLOWPUSH(FOLLOW_proc_init_in_proc_instantiations229); proc_init(ctx); @@ -2549,7 +2536,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:117:16: sync_def + // /Users/bion/projects/iordache/translator/pngenerator.g:104:16: sync_def { FOLLOWPUSH(FOLLOW_sync_def_in_proc_instantiations233); sync_def(ctx); @@ -2567,7 +2554,7 @@ } break; case 3: - // /Users/bion/projects/iordache/translator/pngenerator.g:117:27: proc_start + // /Users/bion/projects/iordache/translator/pngenerator.g:104:27: proc_start { FOLLOWPUSH(FOLLOW_proc_start_in_proc_instantiations237); proc_start(ctx); @@ -2607,7 +2594,7 @@ /** * $ANTLR start proc_init - * /Users/bion/projects/iordache/translator/pngenerator.g:118:1: proc_init : ^( ID ID ( numbered_ID )+ ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:105:1: proc_init : ^( ID ID ( numbered_ID )+ ) ; */ static void proc_init(ppngenerator ctx) @@ -2617,8 +2604,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:119:2: ( ^( ID ID ( numbered_ID )+ ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:119:4: ^( ID ID ( numbered_ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:106:2: ( ^( ID ID ( numbered_ID )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:106:4: ^( ID ID ( numbered_ID )+ ) { MATCHT(ID, &FOLLOW_ID_in_proc_init247); if (HASEXCEPTION()) @@ -2648,7 +2635,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:119:12: ( numbered_ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:106:12: ( numbered_ID )+ { int cnt17=0; @@ -2743,7 +2730,7 @@ /** * $ANTLR start sync_def - * /Users/bion/projects/iordache/translator/pngenerator.g:120:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:107:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ; */ static void sync_def(ppngenerator ctx) @@ -2753,8 +2740,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:121:2: ( ^( SYNC_TOK ( group_elements )+ ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:121:4: ^( SYNC_TOK ( group_elements )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:108:2: ( ^( SYNC_TOK ( group_elements )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:108:4: ^( SYNC_TOK ( group_elements )+ ) { MATCHT(SYNC_TOK, &FOLLOW_SYNC_TOK_in_sync_def263); if (HASEXCEPTION()) @@ -2775,7 +2762,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:121:15: ( group_elements )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:108:15: ( group_elements )+ { int cnt18=0; @@ -2870,7 +2857,7 @@ /** * $ANTLR start constraints - * /Users/bion/projects/iordache/translator/pngenerator.g:123:1: constraints : ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:110:1: constraints : ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) ; */ static void constraints(ppngenerator ctx) @@ -2880,8 +2867,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:124:2: ( ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:124:4: ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) + // /Users/bion/projects/iordache/translator/pngenerator.g:111:2: ( ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:111:4: ^( constraint_block ( eq )* ( live_def )? ( uncontrol )? ( unobserve )? ) { FOLLOWPUSH(FOLLOW_constraint_block_in_constraints278); constraint_block(ctx); @@ -2907,7 +2894,7 @@ return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:124:23: ( eq )* + // /Users/bion/projects/iordache/translator/pngenerator.g:111:23: ( eq )* for (;;) { @@ -2951,7 +2938,7 @@ loop19: ; /* Jump out to here if this rule does not match */ - // /Users/bion/projects/iordache/translator/pngenerator.g:124:27: ( live_def )? + // /Users/bion/projects/iordache/translator/pngenerator.g:111:27: ( live_def )? { int alt20=2; { @@ -2985,7 +2972,7 @@ } } - // /Users/bion/projects/iordache/translator/pngenerator.g:124:37: ( uncontrol )? + // /Users/bion/projects/iordache/translator/pngenerator.g:111:37: ( uncontrol )? { int alt21=2; { @@ -3019,7 +3006,7 @@ } } - // /Users/bion/projects/iordache/translator/pngenerator.g:124:48: ( unobserve )? + // /Users/bion/projects/iordache/translator/pngenerator.g:111:48: ( unobserve )? { int alt22=2; { @@ -3086,7 +3073,7 @@ /** * $ANTLR start proc_start - * /Users/bion/projects/iordache/translator/pngenerator.g:126:1: proc_start : ^( START ( ID )+ ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:113:1: proc_start : ^( START ( ID )+ ) ; */ static void proc_start(ppngenerator ctx) @@ -3096,8 +3083,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:127:2: ( ^( START ( ID )+ ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:127:4: ^( START ( ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:114:2: ( ^( START ( ID )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:114:4: ^( START ( ID )+ ) { MATCHT(START, &FOLLOW_START_in_proc_start302); if (HASEXCEPTION()) @@ -3118,7 +3105,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:127:12: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:114:12: ( ID )+ { int cnt23=0; @@ -3210,7 +3197,7 @@ /** * $ANTLR start constraint_block - * /Users/bion/projects/iordache/translator/pngenerator.g:128:2: constraint_block : ID ; + * /Users/bion/projects/iordache/translator/pngenerator.g:115:2: constraint_block : ID ; */ static void constraint_block(ppngenerator ctx) @@ -3220,8 +3207,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:129:2: ( ID ) - // /Users/bion/projects/iordache/translator/pngenerator.g:129:4: ID + // /Users/bion/projects/iordache/translator/pngenerator.g:116:2: ( ID ) + // /Users/bion/projects/iordache/translator/pngenerator.g:116:4: ID { MATCHT(ID, &FOLLOW_ID_in_constraint_block315); if (HASEXCEPTION()) @@ -3255,7 +3242,7 @@ /** * $ANTLR start eq - * /Users/bion/projects/iordache/translator/pngenerator.g:131:1: eq : ( relationalExpression | ^( EQS_OP eq eq ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:118:1: eq : ( relationalExpression | ^( EQS_OP eq eq ) ); */ static void eq(ppngenerator ctx) @@ -3266,7 +3253,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:132:2: ( relationalExpression | ^( EQS_OP eq eq ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:119:2: ( relationalExpression | ^( EQS_OP eq eq ) ) ANTLR3_UINT32 alt24; @@ -3304,7 +3291,7 @@ switch (alt24) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:132:4: relationalExpression + // /Users/bion/projects/iordache/translator/pngenerator.g:119:4: relationalExpression { FOLLOWPUSH(FOLLOW_relationalExpression_in_eq325); relationalExpression(ctx); @@ -3322,7 +3309,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:133:4: ^( EQS_OP eq eq ) + // /Users/bion/projects/iordache/translator/pngenerator.g:120:4: ^( EQS_OP eq eq ) { MATCHT(EQS_OP, &FOLLOW_EQS_OP_in_eq331); if (HASEXCEPTION()) @@ -3403,7 +3390,7 @@ /** * $ANTLR start relationalExpression - * /Users/bion/projects/iordache/translator/pngenerator.g:135:1: relationalExpression : ( additiveExpression | ^( EQ_OP relationalExpression relationalExpression ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:122:1: relationalExpression : ( additiveExpression | ^( EQ_OP relationalExpression relationalExpression ) ); */ static void relationalExpression(ppngenerator ctx) @@ -3414,7 +3401,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:136:5: ( additiveExpression | ^( EQ_OP relationalExpression relationalExpression ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:123:5: ( additiveExpression | ^( EQ_OP relationalExpression relationalExpression ) ) ANTLR3_UINT32 alt25; @@ -3452,7 +3439,7 @@ switch (alt25) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:136:9: additiveExpression + // /Users/bion/projects/iordache/translator/pngenerator.g:123:9: additiveExpression { FOLLOWPUSH(FOLLOW_additiveExpression_in_relationalExpression351); additiveExpression(ctx); @@ -3470,7 +3457,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:137:7: ^( EQ_OP relationalExpression relationalExpression ) + // /Users/bion/projects/iordache/translator/pngenerator.g:124:7: ^( EQ_OP relationalExpression relationalExpression ) { MATCHT(EQ_OP, &FOLLOW_EQ_OP_in_relationalExpression360); if (HASEXCEPTION()) @@ -3551,7 +3538,7 @@ /** * $ANTLR start additiveExpression - * /Users/bion/projects/iordache/translator/pngenerator.g:139:1: additiveExpression : ( primary | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:126:1: additiveExpression : ( primary | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ); */ static void additiveExpression(ppngenerator ctx) @@ -3562,7 +3549,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:140:5: ( primary | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:127:5: ( primary | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ) ANTLR3_UINT32 alt26; @@ -3664,7 +3651,7 @@ switch (alt26) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:140:9: primary + // /Users/bion/projects/iordache/translator/pngenerator.g:127:9: primary { FOLLOWPUSH(FOLLOW_primary_in_additiveExpression380); primary(ctx); @@ -3682,7 +3669,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:141:7: ^( ADD additiveExpression additiveExpression ) + // /Users/bion/projects/iordache/translator/pngenerator.g:128:7: ^( ADD additiveExpression additiveExpression ) { MATCHT(ADD, &FOLLOW_ADD_in_additiveExpression389); if (HASEXCEPTION()) @@ -3741,7 +3728,7 @@ } break; case 3: - // /Users/bion/projects/iordache/translator/pngenerator.g:142:7: ^( SUB additiveExpression additiveExpression ) + // /Users/bion/projects/iordache/translator/pngenerator.g:129:7: ^( SUB additiveExpression additiveExpression ) { MATCHT(SUB, &FOLLOW_SUB_in_additiveExpression403); if (HASEXCEPTION()) @@ -3822,7 +3809,7 @@ /** * $ANTLR start primary - * /Users/bion/projects/iordache/translator/pngenerator.g:144:1: primary : ( ID | group_elements | NUM | ^( MULT NUM primary ) | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:131:1: primary : ( ID | group_elements | NUM | ^( MULT NUM primary ) | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ); */ static void primary(ppngenerator ctx) @@ -3833,7 +3820,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:145:5: ( ID | group_elements | NUM | ^( MULT NUM primary ) | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:132:5: ( ID | group_elements | NUM | ^( MULT NUM primary ) | ^( ADD additiveExpression additiveExpression ) | ^( SUB additiveExpression additiveExpression ) ) ANTLR3_UINT32 alt27; @@ -3919,7 +3906,7 @@ switch (alt27) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:145:9: ID + // /Users/bion/projects/iordache/translator/pngenerator.g:132:9: ID { MATCHT(ID, &FOLLOW_ID_in_primary422); if (HASEXCEPTION()) @@ -3934,7 +3921,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:146:7: group_elements + // /Users/bion/projects/iordache/translator/pngenerator.g:133:7: group_elements { FOLLOWPUSH(FOLLOW_group_elements_in_primary430); group_elements(ctx); @@ -3952,7 +3939,7 @@ } break; case 3: - // /Users/bion/projects/iordache/translator/pngenerator.g:147:7: NUM + // /Users/bion/projects/iordache/translator/pngenerator.g:134:7: NUM { MATCHT(NUM, &FOLLOW_NUM_in_primary438); if (HASEXCEPTION()) @@ -3967,7 +3954,7 @@ } break; case 4: - // /Users/bion/projects/iordache/translator/pngenerator.g:148:7: ^( MULT NUM primary ) + // /Users/bion/projects/iordache/translator/pngenerator.g:135:7: ^( MULT NUM primary ) { MATCHT(MULT, &FOLLOW_MULT_in_primary447); if (HASEXCEPTION()) @@ -4023,7 +4010,7 @@ } break; case 5: - // /Users/bion/projects/iordache/translator/pngenerator.g:149:7: ^( ADD additiveExpression additiveExpression ) + // /Users/bion/projects/iordache/translator/pngenerator.g:136:7: ^( ADD additiveExpression additiveExpression ) { MATCHT(ADD, &FOLLOW_ADD_in_primary461); if (HASEXCEPTION()) @@ -4082,7 +4069,7 @@ } break; case 6: - // /Users/bion/projects/iordache/translator/pngenerator.g:150:7: ^( SUB additiveExpression additiveExpression ) + // /Users/bion/projects/iordache/translator/pngenerator.g:137:7: ^( SUB additiveExpression additiveExpression ) { MATCHT(SUB, &FOLLOW_SUB_in_primary475); if (HASEXCEPTION()) @@ -4163,7 +4150,7 @@ /** * $ANTLR start live_def - * /Users/bion/projects/iordache/translator/pngenerator.g:151:1: live_def : ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:138:1: live_def : ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) ); */ static void live_def(ppngenerator ctx) @@ -4174,7 +4161,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:152:2: ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:139:2: ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) ) ANTLR3_UINT32 alt30; @@ -4260,7 +4247,7 @@ switch (alt30) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:152:4: ^( LIVE ALL ( ID )* ) + // /Users/bion/projects/iordache/translator/pngenerator.g:139:4: ^( LIVE ALL ( ID )* ) { MATCHT(LIVE, &FOLLOW_LIVE_in_live_def490); if (HASEXCEPTION()) @@ -4291,7 +4278,7 @@ return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:152:15: ( ID )* + // /Users/bion/projects/iordache/translator/pngenerator.g:139:15: ( ID )* for (;;) { @@ -4345,7 +4332,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:153:4: ^( LIVE ( ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:140:4: ^( LIVE ( ID )+ ) { MATCHT(LIVE, &FOLLOW_LIVE_in_live_def502); if (HASEXCEPTION()) @@ -4366,7 +4353,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:153:11: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:140:11: ( ID )+ { int cnt29=0; @@ -4461,7 +4448,7 @@ /** * $ANTLR start uncontrol - * /Users/bion/projects/iordache/translator/pngenerator.g:154:1: uncontrol : ^( UNCONTROL ( ID )+ ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:141:1: uncontrol : ^( UNCONTROL ( ID )+ ) ; */ static void uncontrol(ppngenerator ctx) @@ -4471,8 +4458,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:155:2: ( ^( UNCONTROL ( ID )+ ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:155:4: ^( UNCONTROL ( ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:142:2: ( ^( UNCONTROL ( ID )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:142:4: ^( UNCONTROL ( ID )+ ) { MATCHT(UNCONTROL, &FOLLOW_UNCONTROL_in_uncontrol516); if (HASEXCEPTION()) @@ -4493,7 +4480,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:155:16: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:142:16: ( ID )+ { int cnt31=0; @@ -4585,7 +4572,7 @@ /** * $ANTLR start unobserve - * /Users/bion/projects/iordache/translator/pngenerator.g:156:1: unobserve : ^( UNOBSERVE ( ID )+ ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:143:1: unobserve : ^( UNOBSERVE ( ID )+ ) ; */ static void unobserve(ppngenerator ctx) @@ -4595,8 +4582,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:157:2: ( ^( UNOBSERVE ( ID )+ ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:157:4: ^( UNOBSERVE ( ID )+ ) + // /Users/bion/projects/iordache/translator/pngenerator.g:144:2: ( ^( UNOBSERVE ( ID )+ ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:144:4: ^( UNOBSERVE ( ID )+ ) { MATCHT(UNOBSERVE, &FOLLOW_UNOBSERVE_in_unobserve530); if (HASEXCEPTION()) @@ -4617,7 +4604,7 @@ { return ; } - // /Users/bion/projects/iordache/translator/pngenerator.g:157:16: ( ID )+ + // /Users/bion/projects/iordache/translator/pngenerator.g:144:16: ( ID )+ { int cnt32=0; @@ -4709,7 +4696,7 @@ /** * $ANTLR start other_commands - * /Users/bion/projects/iordache/translator/pngenerator.g:159:1: other_commands : print ; + * /Users/bion/projects/iordache/translator/pngenerator.g:146:1: other_commands : print ; */ static void other_commands(ppngenerator ctx) @@ -4719,8 +4706,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:160:2: ( print ) - // /Users/bion/projects/iordache/translator/pngenerator.g:160:4: print + // /Users/bion/projects/iordache/translator/pngenerator.g:147:2: ( print ) + // /Users/bion/projects/iordache/translator/pngenerator.g:147:4: print { FOLLOWPUSH(FOLLOW_print_in_other_commands544); print(ctx); @@ -4757,7 +4744,7 @@ /** * $ANTLR start print - * /Users/bion/projects/iordache/translator/pngenerator.g:161:1: print : ^( PRINT ID group_elements ) ; + * /Users/bion/projects/iordache/translator/pngenerator.g:148:1: print : ^( PRINT ID group_elements ) ; */ static void print(ppngenerator ctx) @@ -4767,8 +4754,8 @@ { - // /Users/bion/projects/iordache/translator/pngenerator.g:162:2: ( ^( PRINT ID group_elements ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:162:4: ^( PRINT ID group_elements ) + // /Users/bion/projects/iordache/translator/pngenerator.g:149:2: ( ^( PRINT ID group_elements ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:149:4: ^( PRINT ID group_elements ) { MATCHT(PRINT, &FOLLOW_PRINT_in_print554); if (HASEXCEPTION()) @@ -4843,7 +4830,7 @@ /** * $ANTLR start group_elements - * /Users/bion/projects/iordache/translator/pngenerator.g:164:1: group_elements : ( ID | ^( DOT group_elements ID ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:151:1: group_elements : ( ID | ^( DOT group_elements ID ) ); */ static void group_elements(ppngenerator ctx) @@ -4854,7 +4841,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:165:2: ( ID | ^( DOT group_elements ID ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:152:2: ( ID | ^( DOT group_elements ID ) ) ANTLR3_UINT32 alt33; @@ -4892,7 +4879,7 @@ switch (alt33) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:165:4: ID + // /Users/bion/projects/iordache/translator/pngenerator.g:152:4: ID { MATCHT(ID, &FOLLOW_ID_in_group_elements569); if (HASEXCEPTION()) @@ -4907,7 +4894,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:166:4: ^( DOT group_elements ID ) + // /Users/bion/projects/iordache/translator/pngenerator.g:153:4: ^( DOT group_elements ID ) { MATCHT(DOT, &FOLLOW_DOT_in_group_elements575); if (HASEXCEPTION()) @@ -4985,7 +4972,7 @@ /** * $ANTLR start numbered_ID - * /Users/bion/projects/iordache/translator/pngenerator.g:167:1: numbered_ID : ( ID | ^( ID INT ) ); + * /Users/bion/projects/iordache/translator/pngenerator.g:154:1: numbered_ID : ( ID | ^( ID INT ) ); */ static void numbered_ID(ppngenerator ctx) @@ -4996,7 +4983,7 @@ { { - // /Users/bion/projects/iordache/translator/pngenerator.g:168:2: ( ID | ^( ID INT ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:155:2: ( ID | ^( ID INT ) ) ANTLR3_UINT32 alt34; @@ -5058,7 +5045,7 @@ switch (alt34) { case 1: - // /Users/bion/projects/iordache/translator/pngenerator.g:168:4: ID + // /Users/bion/projects/iordache/translator/pngenerator.g:155:4: ID { MATCHT(ID, &FOLLOW_ID_in_numbered_ID589); if (HASEXCEPTION()) @@ -5073,7 +5060,7 @@ } break; case 2: - // /Users/bion/projects/iordache/translator/pngenerator.g:169:4: ^( ID INT ) + // /Users/bion/projects/iordache/translator/pngenerator.g:156:4: ^( ID INT ) { MATCHT(ID, &FOLLOW_ID_in_numbered_ID595); if (HASEXCEPTION()) @@ -5140,8 +5127,8 @@ // $ANTLR start synpred2_pngenerator static void synpred2_pngenerator_fragment(ppngenerator ctx ) { - // /Users/bion/projects/iordache/translator/pngenerator.g:85:22: ( proc_instantiations ) - // /Users/bion/projects/iordache/translator/pngenerator.g:85:22: proc_instantiations + // /Users/bion/projects/iordache/translator/pngenerator.g:72:22: ( proc_instantiations ) + // /Users/bion/projects/iordache/translator/pngenerator.g:72:22: proc_instantiations { FOLLOWPUSH(FOLLOW_proc_instantiations_in_synpred2_pngenerator80); proc_instantiations(ctx); @@ -5169,8 +5156,8 @@ // $ANTLR start synpred27_pngenerator static void synpred27_pngenerator_fragment(ppngenerator ctx ) { - // /Users/bion/projects/iordache/translator/pngenerator.g:140:9: ( primary ) - // /Users/bion/projects/iordache/translator/pngenerator.g:140:9: primary + // /Users/bion/projects/iordache/translator/pngenerator.g:127:9: ( primary ) + // /Users/bion/projects/iordache/translator/pngenerator.g:127:9: primary { FOLLOWPUSH(FOLLOW_primary_in_synpred27_pngenerator380); primary(ctx); @@ -5198,8 +5185,8 @@ // $ANTLR start synpred28_pngenerator static void synpred28_pngenerator_fragment(ppngenerator ctx ) { - // /Users/bion/projects/iordache/translator/pngenerator.g:141:7: ( ^( ADD additiveExpression additiveExpression ) ) - // /Users/bion/projects/iordache/translator/pngenerator.g:141:7: ^( ADD additiveExpression additiveExpression ) + // /Users/bion/projects/iordache/translator/pngenerator.g:128:7: ( ^( ADD additiveExpression additiveExpression ) ) + // /Users/bion/projects/iordache/translator/pngenerator.g:128:7: ^( ADD additiveExpression additiveExpression ) { MATCHT(ADD, &FOLLOW_ADD_in_synpred28_pngenerator389); if (HASEXCEPTION()) @@ -5268,8 +5255,8 @@ // $ANTLR start synpred29_pngenerator static void synpred29_pngenerator_fragment(ppngenerator ctx ) { - // /Users/bion/projects/iordache/translator/pngenerator.g:145:9: ( ID ) - // /Users/bion/projects/iordache/translator/pngenerator.g:145:9: ID + // /Users/bion/projects/iordache/translator/pngenerator.g:132:9: ( ID ) + // /Users/bion/projects/iordache/translator/pngenerator.g:132:9: ID { MATCHT(ID, &FOLLOW_ID_in_synpred29_pngenerator422); if (HASEXCEPTION()) @@ -5294,8 +5281,8 @@ // $ANTLR start synpred30_pngenerator static void synpred30_pngenerator_fragment(ppngenerator ctx ) { - // /Users/bion/projects/iordache/translator/pngenerator.g:146:7: ( group_elements ) - // /Users/bion/projects/iordache/translator/pngenerator.g:146:7: group_elements + // /Users/bion/projects/iordache/translator/pngenerator.g:133:7: ( group_elements ) + // /Users/bion/projects/iordache/translator/pngenerator.g:133:7: group_elements { FOLLOWPUSH(FOLLOW_group_elements_in_synpred30_pngenerator430); group_elements(ctx); Modified: translator/pngenerator.g =================================================================== --- translator/pngenerator.g 2009-06-17 20:56:13 UTC (rev 63) +++ translator/pngenerator.g 2009-06-17 21:14:16 UTC (rev 64) @@ -12,11 +12,16 @@ @header { //this will bring in everything else we need from the PNS library #include "pns.h" + #include "dataStructures.h" #undef GET_TOKEN #undef GET_TEXT #undef WARN_AT #undef FAIL_AT + #undef kNAME + #undef kPROC + #undef kPLACES + #undef kTRANS #define GET_TOKEN(list, num) (pANTLR3_COMMON_TOKEN) list->get(list, num) //retrieves the text of the numth token in the list @@ -29,20 +34,16 @@ #define kPROC 2 #define kPLACES 3 #define kTRANS 4 - #define kNUM_PLACES 5 - #define kNUM_TRANS 6 } @members { static void showContext(pANTLR3_BASE_TREE tree); - static void addPlace(pANTLR3_HASH_TABLE placeList, void* place); - static void addTrans(pANTLR3_HASH_TABLE transList, void* trans); static void deallocProcess(process* proc); //see kDEFINES in pnscript.g - pANTLR3_HASH_TABLE processes; + ASSOC_ARRAY* processes; //see kDEFINES in pnscript.g - pANTLR3_HASH_TABLE threads; + ASSOC_ARRAY* threads; specs* specification; static void showContext(pANTLR3_BASE_TREE t) { @@ -50,20 +51,6 @@ fprintf(stderr, "Line \%i, character \%i\n", tok->getLine(tok), tok->getCharPositionInLine(tok)); } - static void addPlace(pANTLR3_HASH_TABLE placeList, void* place) { - static unsigned int* i; - i = tmalloc(sizeof(int)); - *i = placeList->size(placeList); - placeList->put(placeList, (char*) place, i, free); - } - - static void addTrans(pANTLR3_HASH_TABLE transList, void* trans) { - static unsigned int* i; - i = tmalloc(sizeof(int)); - *i = transList->size(transList); - transList->put(transList, (char*) trans, i, free); - } - static void deallocProcess(process* proc) { if(proc->pn != NULL) { deallocpn(proc->pn); @@ -72,7 +59,7 @@ } //this encompasses the grammer and serves as our entry point -pn[pANTLR3_HASH_TABLE procData, pANTLR3_HASH_TABLE threadData] +pn[ASSOC_ARRAY* procData, ASSOC_ARRAY* threadData] @init { processes = procData; //we'll assume there are about 3 instances of every process @@ -96,7 +83,7 @@ : ID { pANTLR3_LIST list = processes->get(processes, $ID.text->chars); $proc_definitions::proc = (process*) list->get(list, kPROC); - pn = createpn("pnum tnum", *((int*) list->get(list, kNUM_PLACES)), *((int*) list->get(list, kNUM_TRANS))); +// pn = createpn("pnum tnum", *((int*) list->get(list, kNUM_PLACES)), *((int*) list->get(list, kNUM_TRANS))); $proc_definitions::proc->pn = &pn; }; trans_defs Modified: translator/pngenerator.h =================================================================== --- translator/pngenerator.h 2009-06-17 20:56:13 UTC (rev 63) +++ translator/pngenerator.h 2009-06-17 21:14:16 UTC (rev 64) @@ -2,7 +2,7 @@ * This C header file was generated by $ANTLR version 3.1.2 * * - From the grammar source file : /Users/bion/projects/iordache/translator/pngenerator.g - * - On : 2009-06-16 21:49:36 + * - On : 2009-06-17 16:11:12 * - for the tree parser : pngeneratorTreeParser * * Editing it, at least manually, is not wise. * @@ -113,11 +113,16 @@ //this will bring in everything else we need fro... [truncated message content] |
From: <ee...@us...> - 2009-06-17 20:56:37
|
Revision: 63 http://pntool.svn.sourceforge.net/pntool/?rev=63&view=rev Author: eegs002 Date: 2009-06-17 20:56:13 +0000 (Wed, 17 Jun 2009) Log Message: ----------- Edited to adhere to new messaging contract Modified Paths: -------------- codegen/src/plantCompiler.c codegen/src/plantCompiler.h Modified: codegen/src/plantCompiler.c =================================================================== --- codegen/src/plantCompiler.c 2009-06-17 03:30:37 UTC (rev 62) +++ codegen/src/plantCompiler.c 2009-06-17 20:56:13 UTC (rev 63) @@ -66,7 +66,7 @@ genFunctionPrototype(plantFile); - createGlobals(plantFile, pnsPlant->pnum); + createGlobals(plantFile); createMain(plantFile); @@ -76,6 +76,8 @@ createSignalVars(plantFile); + unbufferIO(plantFile); + genInitialStart(pnsPlant, plantFile); genPlaceCode(pnsPlant, plantFile); @@ -83,6 +85,7 @@ genTransitionCode(pnsPlant, plantFile); finalizeFile(plantFile); + //This must be called once the written main is complete since it //changes the position indicator to the end of the file genEnabledFunction(pnsPlant, plantFile); @@ -103,8 +106,6 @@ genGotoCurrentMark(plantFile); - genCallMainFunc(plantFile); - fclose(plantFile); }//End compileSinglePlant @@ -201,35 +202,18 @@ //Creates Global Variables -void createGlobals(FILE* plantFile, int pnum) +void createGlobals(FILE* plantFile) { - int i = 0; fprintf(plantFile,"\n#ifndef PIPES\n"); //This FLAG is set to 1 when a transition is allowed to fire fprintf(plantFile,"sig_atomic_t ___FIRE_FLAG;\n"); - fprintf(plantFile,"#else\n"); - - fprintf(plantFile,"const int ___placesArray[] = {"); - for(i = 0; i<pnum; i++) - { - fprintf(plantFile,"%d",i); - if(i != pnum - 1) - fprintf(plantFile,","); - } - fprintf(plantFile,"};\n"); - - fprintf(plantFile,"\n"); - fprintf(plantFile,"pthread_mutex_t ___alertMutex;\n"); - fprintf(plantFile,"pthread_attr_t ___detachState;\n"); - fprintf(plantFile,"#endif\n"); fprintf(plantFile,"\n//The maximum size a pipe message can be\n"); fprintf(plantFile,"//This restricts the maximum number of digits in"\ " a transition label\n"); fprintf(plantFile,"#define MAX_MESSAGE_SIZE 200\n"); - fprintf(plantFile,"\n//Restricts plant to 50 digit long place numbers max\n"); fprintf(plantFile,"#define MAX_PLACE_DIGITS 50\n"); }//End createGlobals @@ -348,8 +332,16 @@ }//End createPNSCode +//Creates the code to unbuffer stdin, stdout +void unbufferIO(FILE* plantFile) +{ + fprintf(plantFile, "\n//Unbuffer IO\n"); + fprintf(plantFile, "setvbuf ( stdout , NULL , _IONBF , 1024 );\n"); + fprintf(plantFile, "setvbuf ( stdin , NULL , _IONBF , 1024 );\n"); +} + //Creates the initial goto statement //based on the initial marking void genInitialStart(pns *pnsPlant, FILE* plantFile) @@ -558,11 +550,13 @@ fprintf(plantFile,"\t#else\n"); fprintf(plantFile,"\t//Alert the supervisor and wait for"\ " permission to fire\n"); - fprintf(plantFile,"\twaitForPermission((___pnsPlant.t[%d]).l);\n",i); + fprintf(plantFile,"\twaitForPermission((___pnsPlant.t[%d]).l,%d);\n",i,i); fprintf(plantFile,"\t#endif\n"); fprintf(plantFile,"\n\t//Update the current marking\n"); fprintf(plantFile,"\tupdatePns(&___pnsPlant,%d,"\ "___currentMarking);\n",i); + + fprintf(plantFile,"\tprintf(\"___F%%d\\n\",pthread_self());\n"); fprintf(plantFile,"\n\tgoto CM;\n"); fprintf(plantFile,"\n\t} //End if(isEnabled)\n"); @@ -771,9 +765,8 @@ //Generates and outputs the code for the following function: - -// void waitForPermission(int ___lblNbr); - +// +// void waitForPermission(int ___lblNbr, int ___transNbr); // // This function is the algorithm that causes the transition // to signal the supervisor and wait for permission from @@ -784,7 +777,7 @@ fprintf(plantFile,"\n//Transition calls this function to wait"\ " for permission to fire from the supervisor\n"); fprintf(plantFile,"//PIPES VERSION\n"); - fprintf(plantFile,"void waitForPermission(int ___lblNbr)\n{\n"); + fprintf(plantFile,"void waitForPermission(int ___lblNbr, int ___transNbr)\n{\n"); fprintf(plantFile,"\n\tchar ___buffer[MAX_MESSAGE_SIZE];\n"); @@ -799,7 +792,8 @@ //Alert the supervisor fprintf(plantFile,"\n\t//Alert the supervisor\n"); - fprintf(plantFile,"\tprintf(\"?%%d\\n\",___lblNbr);\n"); + fprintf(plantFile,"\tprintf(\"___?%%d:%%d-%%d\\n\",pthread_self(),"\ + "___lblNbr,___transNbr);\n"); //Suspend Until Response Received fprintf(plantFile,"\n\t//Wait until a response received\n"); @@ -807,7 +801,7 @@ //If the answer is no, wait and try again fprintf(plantFile,"\n\t//Keep trying until permission is received\n"); - fprintf(plantFile,"\twhile(tolower(___buffer[0]) != 'y')\n\t{\n"); + fprintf(plantFile,"\twhile(tolower(___buffer[3]) != 'y')\n\t{\n"); //DEBUG statements fprintf(plantFile,"\t\t#ifdef DEBUG\n"); @@ -823,7 +817,8 @@ "\\n\",getpid());\n"); fprintf(plantFile,"\t\t#endif\n"); - fprintf(plantFile,"\t\tprintf(\"\\n___?%%d\\n\",___lblNbr);\n"); + fprintf(plantFile,"\t\tprintf(\"___?%%d:%%d-%%d\\n\",pthread_self(),"\ + "___lblNbr,___transNbr);\n"); fprintf(plantFile,"\t\tfgets(___buffer, MAX_MESSAGE_SIZE, stdin);\n"); fprintf(plantFile,"\t}//End while\n"); @@ -892,122 +887,49 @@ // // This function returns an integer that indicates the place number -// to begin at based on the current marking (this is the first token found) -// A new thread created for every other token +// to begin at based on the current marking. void genGotoCurrentMark(FILE *plantFile) { - fprintf(plantFile,"\n//Returns an int that indicates place number to goto"\ - " based on first token in the current marking\n"); - fprintf(plantFile,"//Also spawns threads for all other tokens\n"); - fprintf(plantFile,"int gotoCurrentMark(pns *___pnsPtr,"\ - " int *___currentMarking)\n"); - fprintf(plantFile,"{\n"); - fprintf(plantFile,"\tint ___placeCounter = 0;\n"); - fprintf(plantFile,"\tint ___tokenCounter = 0;\n"); - fprintf(plantFile,"\tint ___threadIndex = 0;\n"); - fprintf(plantFile,"\tint ___nbrInitPlaces = 0;\n"); - fprintf(plantFile,"\tint ___firstMark = -1;\n"); - - - fprintf(plantFile,"\tfor(___placeCounter; ___placeCounter<(___pnsPtr->pnum); ___placeCounter++)\n"); - fprintf(plantFile,"\t{\n"); - fprintf(plantFile,"\t\t\t___nbrInitPlaces+=___currentMarking[___placeCounter];\n"); - fprintf(plantFile,"\t}//End for\n\n"); - - - fprintf(plantFile,"\t#ifdef DEBUG\n"); - fprintf(plantFile,"\t\tprintf(\"\\nPLANT %d: FOUND %d TOKENS\\n\","\ - "getpid(),___tokenIndex);\n"); - fprintf(plantFile,"\t#endif\n"); - - - fprintf(plantFile,"\tif(___nbrInitPlaces == 0)\n"); - fprintf(plantFile,"\t{\n"); - fprintf(plantFile,"\t\tperror(\"No initial marking!\");\n"); - fprintf(plantFile,"\t\texit(0);\n"); - fprintf(plantFile,"\t}//End if\n"); - fprintf(plantFile,"\telse\n"); - fprintf(plantFile,"\t{\n"); - - - fprintf(plantFile,"\t\t#ifdef DEBUG\n"); - fprintf(plantFile,"\t\t\tprintf(\"\\nPLANT %d: CREATING"\ - " THREADS\\n\",getpid());\n"); - fprintf(plantFile,"\t\t#endif\n"); - - - fprintf(plantFile,"\t\t pthread_t ___threads[___nbrInitPlaces];\n"); - fprintf(plantFile,"\t\t \n"); - fprintf(plantFile,"\t\t for(___placeCounter = 0;"\ - "___placeCounter<(___pnsPtr->pnum);___placeCounter++)\n"); - fprintf(plantFile,"\t\t {\n"); - - - fprintf(plantFile,"\t\t\t for(___tokenCounter = 0; ___tokenCounter < "\ - "___currentMarking[___placeCounter]; ___tokenCounter++)\n"); - fprintf(plantFile,"\t\t\t {\n"); - fprintf(plantFile,"\t\t\t\t\tif(___firstMark == -1)\n"); - fprintf(plantFile,"\t\t\t\t\t\t___firstMark = ___placeCounter;\n"); - fprintf(plantFile,"\t\t\t\t\telse\n"); - fprintf(plantFile,"\t\t\t\t\t{\n"); - fprintf(plantFile,"\t\t\t\t\t\tpthread_create(&___threads[___threadIndex],"\ - "&___detachState, callMain,"\ - "(void *)&___placesArray[___placeCounter]);\n"); - fprintf(plantFile,"\t\t\t\t\t\t___threadIndex++;\n"); - fprintf(plantFile,"\t\t\t\t\t}//End else\n"); - - fprintf(plantFile,"\t\t\t }//End for\n"); - fprintf(plantFile,"\t\t }//End for\n"); - - fprintf(plantFile,"\t\t \n"); - - fprintf(plantFile,"\t\t#ifdef DEBUG\n"); - fprintf(plantFile,"\t\t\tprintf(\"\\nPLANT %d: TRHEADS"\ - " CREATED\\n\",getpid());\n"); - fprintf(plantFile,"\t\t#endif\n"); - - fprintf(plantFile,"\n"); - - fprintf(plantFile,"\t\treturn ___firstMark;\n"); - fprintf(plantFile,"\t}//End else\n"); - fprintf(plantFile,"}//End gotoInitMark\n"); + fprintf(plantFile,"\n\n//Returns an int that indicates place"\ + " number to goto based on the current marking\n"); -}//End genGotoInitMark + fprintf(plantFile,"int gotoCurrentMark(pns *___pnsPtr,"\ + " int *___currentMarking)\n"); + fprintf(plantFile,"{\n\tint ___placeCounter = 0;\n");; + fprintf(plantFile,"\tint ___nbrInitPlaces = 0;\n"); + fprintf(plantFile,"\tint ___firstMark = -1;\n"); + + fprintf(plantFile,"\tfor(___placeCounter;"\ + " ___placeCounter<(___pnsPtr->pnum); ___placeCounter++)\n\t{\n"); + + fprintf(plantFile,"\t\tif(___currentMarking[___placeCounter] > 0)"\ + "\n\t\t{\n"); + fprintf(plantFile,"\t\t\t___nbrInitPlaces++;\n"); + fprintf(plantFile,"\t\t\tif(___firstMark == -1)\n"); + fprintf(plantFile,"\t\t\t\t___firstMark = ___placeCounter;\n"); + fprintf(plantFile,"\t\t}//End if\n"); + fprintf(plantFile,"\t}//End for\n"); + + fprintf(plantFile,"\n\tif(___nbrInitPlaces == 0)\n\t{\n"); + fprintf(plantFile,"\t\tperror(\"No initial marking!\");\n"); + fprintf(plantFile,"\t\texit(0);\n"); + fprintf(plantFile,"\t}//End if\n"); + fprintf(plantFile,"\telse\n\t{\n"); + + fprintf(plantFile,"\t\tif(___nbrInitPlaces > 1)\n\t\t{\n"); + fprintf(plantFile,"\t\t\t printf(\"CURRENT MARKING MORE"\ + " THAN 1 PLACE\\n\");\n"); + fprintf(plantFile,"\t\t\t printf(\"STARTING AT FIRST PLACE"\ + " DETECTED\\n\");\n"); + fprintf(plantFile,"\t\t}//End if\n"); + fprintf(plantFile,"\n\t\treturn ___firstMark;\n"); + fprintf(plantFile,"\t}//End else\n"); + fprintf(plantFile,"}//End gotoInitMark\n"); -//Generates and outputs the code for the following function: - -// void *callMain(void *___currentMarking) + +}//End genGotoInitMark -// -// This is the entry point for all new threads and calls main -// with the appropriate arguments -void genCallMainFunc(FILE *plantFile) -{ - fprintf(plantFile,"\n//WORKS WITH PIPES ONLY\n"); - fprintf(plantFile,"//The entry point for all new threads and calls main"\ - " with the appropriate arguments\n"); - fprintf(plantFile,"void *callMain(void *___currentMarking)\n"); - fprintf(plantFile,"{\n"); - fprintf(plantFile," char ___newMarking[MAX_PLACE_DIGITS];\n"); - fprintf(plantFile," sprintf(___newMarking,\"%d\",*(int *)"\ - " ___currentMarking);\n"); - - fprintf(plantFile," char *argv[] = {\"THREAD MAIN\",\"-m\","\ - "___newMarking};\n"); - fprintf(plantFile," \n"); - - fprintf(plantFile," #ifdef DEBUG\n"); - fprintf(plantFile,"\t\tprintf(\"\\nPLANT %d: TRHEAD %d CALLING "\ - "MAIN\\n\",getpid(),pthread_self());\n"); - fprintf(plantFile,"\t#endif\n"); - - fprintf(plantFile," \n"); - fprintf(plantFile," main(3, argv);\n"); - fprintf(plantFile,"\n}//End call Main\n"); -} - - //Outputs the function prototypes to plantFile void genFunctionPrototype(FILE* plantFile) { @@ -1020,11 +942,10 @@ "pid_t ___pidSup,union sigval *___sValPtr);\n"); fprintf(plantFile,"#else\n"); //fprintf(plantFile,"\t//PIPES DEFINITION\n"); - fprintf(plantFile,"\tvoid waitForPermission(int ___lblNbr);\n"); + fprintf(plantFile,"\tvoid waitForPermission(int ___lblNbr,int ___transNbr);\n"); fprintf(plantFile,"#endif\n"); fprintf(plantFile,"\nvoid updatePns(pns *___pnsPtr,int ___cTnum,"\ " int *___currentMarking);\n"); fprintf(plantFile,"int gotoCurrentMark(pns *___pnsPtr,"\ " int *___currentMarking);\n"); - fprintf(plantFile,"void *callMain(void *___currentMarking);\n"); }//End genFunction Prototype Modified: codegen/src/plantCompiler.h =================================================================== --- codegen/src/plantCompiler.h 2009-06-17 03:30:37 UTC (rev 62) +++ codegen/src/plantCompiler.h 2009-06-17 20:56:13 UTC (rev 63) @@ -76,9 +76,13 @@ //Creates Global Variables -void createGlobals(FILE* plantFile, int pnum); +void createGlobals(FILE* plantFile); +//Creates the code to unbuffer stdin, stdout +void unbufferIO(FILE* plantFile); + + //Creates the initial goto statement //based on the initial marking //Currently only one token is supported! @@ -161,8 +165,7 @@ //Generates and outputs the code for the following function: -// void waitForPermission(sigset_t *___sMskPtr,pid_t ___pidSup, -// union sigval *____sValPtr); +// void waitForPermission(int ___lblNbr, int ___transNbr); // // This function is the algorithm that causes the transition @@ -191,22 +194,11 @@ // // This function returns an integer that indicates the place number -// to begin at based on the current marking (this is the first token found) -// A new thread created for every other token +// to begin at based on the current marking. void genGotoCurrentMark(FILE *plantFile); -//Generates and outputs the code for the following function: - -// void *callMain(void *___currentMarking) -// -// This is the entry point for all new threads and calls main -// with the appropriate arguments -void genCallMainFunc(FILE *plantFile); - - - //Outputs the function prototypes to plantFile void genFunctionPrototype(FILE* plantFile); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2009-06-17 03:30:45
|
Revision: 62 http://pntool.svn.sourceforge.net/pntool/?rev=62&view=rev Author: thecodeweasel Date: 2009-06-17 03:30:37 +0000 (Wed, 17 Jun 2009) Log Message: ----------- Validating that defined processes are declared Creating petri nets for processes miscellaneous cleanup Modified Paths: -------------- translator/pncompactor.c translator/pncompactor.g translator/pncompactor.h translator/pngenerator.c translator/pngenerator.g translator/pngenerator.h translator/pnscript.g translator/pnscriptLexer.c translator/pnscriptLexer.h translator/pnscriptParser.c translator/pnscriptParser.h translator/pnscript_java_compat.g Modified: translator/pncompactor.c =================================================================== --- translator/pncompactor.c 2009-06-16 22:13:31 UTC (rev 61) +++ translator/pncompactor.c 2009-06-17 03:30:37 UTC (rev 62) @@ -2,7 +2,7 @@ * This C source file was generated by $ANTLR version 3.1.2 * * - From the grammar source file : /Users/bion/projects/iordache/translator/pncompactor.g - * - On : 2009-06-16 14:36:48 + * - On : 2009-06-16 22:23:57 * - for the tree parser : pncompactorTreeParser * * Editing it, at least manually, is not wise. * @@ -363,8 +363,6 @@ static pncompactor_pn_return pn (ppncompactor ctx); static pncompactor_proc_definitions_return proc_definitions (ppncompactor ctx); static pncompactor_def_start_return def_start (ppncompactor ctx); -static pncompactor_places_return places (ppncompactor ctx); -static pncompactor_trans_return trans (ppncompactor ctx); static pncompactor_trans_defs_return trans_defs (ppncompactor ctx); static pncompactor_extern_trans_def_return extern_trans_def (ppncompactor ctx); static pncompactor_trans_def_return trans_def (ppncompactor ctx); @@ -389,12 +387,12 @@ static pncompactor_group_elements_return group_elements (ppncompactor ctx); static pncompactor_numbered_ID_return numbered_ID (ppncompactor ctx); static ANTLR3_BOOLEAN synpred2_pncompactor (ppncompactor ctx); +static ANTLR3_BOOLEAN synpred27_pncompactor (ppncompactor ctx); static ANTLR3_BOOLEAN synpred29_pncompactor (ppncompactor ctx); +static ANTLR3_BOOLEAN synpred30_pncompactor (ppncompactor ctx); static ANTLR3_BOOLEAN synpred31_pncompactor (ppncompactor ctx); static ANTLR3_BOOLEAN synpred32_pncompactor (ppncompactor ctx); static ANTLR3_BOOLEAN synpred33_pncompactor (ppncompactor ctx); -static ANTLR3_BOOLEAN synpred34_pncompactor (ppncompactor ctx); -static ANTLR3_BOOLEAN synpred35_pncompactor (ppncompactor ctx); static void pncompactorFree(ppncompactor ctx); /* For use in tree output where we are accumulating rule labels via label += ruleRef * we need a function that knows how to free a return scope when the list is destroyed. @@ -468,8 +466,6 @@ ctx->pn = pn; ctx->proc_definitions = proc_definitions; ctx->def_start = def_start; - ctx->places = places; - ctx->trans = trans; ctx->trans_defs = trans_defs; ctx->extern_trans_def = extern_trans_def; ctx->trans_def = trans_def; @@ -494,12 +490,12 @@ ctx->group_elements = group_elements; ctx->numbered_ID = numbered_ID; ctx->synpred2_pncompactor = synpred2_pncompactor; + ctx->synpred27_pncompactor = synpred27_pncompactor; ctx->synpred29_pncompactor = synpred29_pncompactor; + ctx->synpred30_pncompactor = synpred30_pncompactor; ctx->synpred31_pncompactor = synpred31_pncompactor; ctx->synpred32_pncompactor = synpred32_pncompactor; ctx->synpred33_pncompactor = synpred33_pncompactor; - ctx->synpred34_pncompactor = synpred34_pncompactor; - ctx->synpred35_pncompactor = synpred35_pncompactor; ctx->free = pncompactorFree; ctx->getGrammarFileName = getGrammarFileName; @@ -581,309 +577,291 @@ /** Bitset defining follow set for error recovery in rule state: FOLLOW_def_start_in_proc_definitions108 */ static ANTLR3_BITWORD FOLLOW_def_start_in_proc_definitions108_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; static ANTLR3_BITSET_LIST FOLLOW_def_start_in_proc_definitions108 = { FOLLOW_def_start_in_proc_definitions108_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_places_in_proc_definitions110 */ -static ANTLR3_BITWORD FOLLOW_places_in_proc_definitions110_bits[] = { ANTLR3_UINT64_LIT(0x0000000000010000) }; -static ANTLR3_BITSET_LIST FOLLOW_places_in_proc_definitions110 = { FOLLOW_places_in_proc_definitions110_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_trans_in_proc_definitions112 */ -static ANTLR3_BITWORD FOLLOW_trans_in_proc_definitions112_bits[] = { ANTLR3_UINT64_LIT(0x0000100000100268) }; -static ANTLR3_BITSET_LIST FOLLOW_trans_in_proc_definitions112 = { FOLLOW_trans_in_proc_definitions112_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_trans_defs_in_proc_definitions114 */ -static ANTLR3_BITWORD FOLLOW_trans_defs_in_proc_definitions114_bits[] = { ANTLR3_UINT64_LIT(0x0000100000100268) }; -static ANTLR3_BITSET_LIST FOLLOW_trans_defs_in_proc_definitions114 = { FOLLOW_trans_defs_in_proc_definitions114_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_select_functions_in_proc_definitions117 */ -static ANTLR3_BITWORD FOLLOW_select_functions_in_proc_definitions117_bits[] = { ANTLR3_UINT64_LIT(0x0000100000100008) }; -static ANTLR3_BITSET_LIST FOLLOW_select_functions_in_proc_definitions117 = { FOLLOW_select_functions_in_proc_definitions117_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_nondeterm_in_proc_definitions120 */ -static ANTLR3_BITWORD FOLLOW_nondeterm_in_proc_definitions120_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_nondeterm_in_proc_definitions120 = { FOLLOW_nondeterm_in_proc_definitions120_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_def_start131 */ -static ANTLR3_BITWORD FOLLOW_ID_in_def_start131_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_def_start131 = { FOLLOW_ID_in_def_start131_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_PLACES_in_places141 */ -static ANTLR3_BITWORD FOLLOW_PLACES_in_places141_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_PLACES_in_places141 = { FOLLOW_PLACES_in_places141_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_places143 */ -static ANTLR3_BITWORD FOLLOW_ID_in_places143_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_places143 = { FOLLOW_ID_in_places143_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_TRANS_in_trans155 */ -static ANTLR3_BITWORD FOLLOW_TRANS_in_trans155_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_TRANS_in_trans155 = { FOLLOW_TRANS_in_trans155_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_trans157 */ -static ANTLR3_BITWORD FOLLOW_ID_in_trans157_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_trans157 = { FOLLOW_ID_in_trans157_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_extern_trans_def_in_trans_defs167 */ -static ANTLR3_BITWORD FOLLOW_extern_trans_def_in_trans_defs167_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_extern_trans_def_in_trans_defs167 = { FOLLOW_extern_trans_def_in_trans_defs167_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_trans_def_in_trans_defs172 */ -static ANTLR3_BITWORD FOLLOW_trans_def_in_trans_defs172_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_trans_def_in_trans_defs172 = { FOLLOW_trans_def_in_trans_defs172_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_TO_in_extern_trans_def182 */ -static ANTLR3_BITWORD FOLLOW_TO_in_extern_trans_def182_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_TO_in_extern_trans_def182 = { FOLLOW_TO_in_extern_trans_def182_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_extern_trans_def184 */ -static ANTLR3_BITWORD FOLLOW_ID_in_extern_trans_def184_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_extern_trans_def184 = { FOLLOW_ID_in_extern_trans_def184_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_FROM_in_extern_trans_def192 */ -static ANTLR3_BITWORD FOLLOW_FROM_in_extern_trans_def192_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_FROM_in_extern_trans_def192 = { FOLLOW_FROM_in_extern_trans_def192_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_extern_trans_def194 */ -static ANTLR3_BITWORD FOLLOW_ID_in_extern_trans_def194_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_extern_trans_def194 = { FOLLOW_ID_in_extern_trans_def194_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_trans_def206 */ -static ANTLR3_BITWORD FOLLOW_ID_in_trans_def206_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_trans_def206 = { FOLLOW_ID_in_trans_def206_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_CODE_BLOCK_in_trans_def208 */ -static ANTLR3_BITWORD FOLLOW_CODE_BLOCK_in_trans_def208_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_CODE_BLOCK_in_trans_def208 = { FOLLOW_CODE_BLOCK_in_trans_def208_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_trans_def215 */ -static ANTLR3_BITWORD FOLLOW_ID_in_trans_def215_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_trans_def215 = { FOLLOW_ID_in_trans_def215_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_trans_def217 */ -static ANTLR3_BITWORD FOLLOW_ID_in_trans_def217_bits[] = { ANTLR3_UINT64_LIT(0x0000000000001208) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_trans_def217 = { FOLLOW_ID_in_trans_def217_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_CODE_BLOCK_in_trans_def220 */ -static ANTLR3_BITWORD FOLLOW_CODE_BLOCK_in_trans_def220_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_CODE_BLOCK_in_trans_def220 = { FOLLOW_CODE_BLOCK_in_trans_def220_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_SELECT_DEF_in_select_functions231 */ -static ANTLR3_BITWORD FOLLOW_SELECT_DEF_in_select_functions231_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_SELECT_DEF_in_select_functions231 = { FOLLOW_SELECT_DEF_in_select_functions231_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_select_functions233 */ -static ANTLR3_BITWORD FOLLOW_ID_in_select_functions233_bits[] = { ANTLR3_UINT64_LIT(0x0000000000001000) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_select_functions233 = { FOLLOW_ID_in_select_functions233_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_CODE_BLOCK_in_select_functions235 */ -static ANTLR3_BITWORD FOLLOW_CODE_BLOCK_in_select_functions235_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_CODE_BLOCK_in_select_functions235 = { FOLLOW_CODE_BLOCK_in_select_functions235_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_44_in_nondeterm246 */ -static ANTLR3_BITWORD FOLLOW_44_in_nondeterm246_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_44_in_nondeterm246 = { FOLLOW_44_in_nondeterm246_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_nondeterm248 */ -static ANTLR3_BITWORD FOLLOW_ID_in_nondeterm248_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_nondeterm248 = { FOLLOW_ID_in_nondeterm248_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_proc_init_in_proc_instantiations260 */ -static ANTLR3_BITWORD FOLLOW_proc_init_in_proc_instantiations260_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_proc_init_in_proc_instantiations260 = { FOLLOW_proc_init_in_proc_instantiations260_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_sync_def_in_proc_instantiations264 */ -static ANTLR3_BITWORD FOLLOW_sync_def_in_proc_instantiations264_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_sync_def_in_proc_instantiations264 = { FOLLOW_sync_def_in_proc_instantiations264_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_proc_start_in_proc_instantiations268 */ -static ANTLR3_BITWORD FOLLOW_proc_start_in_proc_instantiations268_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_proc_start_in_proc_instantiations268 = { FOLLOW_proc_start_in_proc_instantiations268_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_proc_init278 */ -static ANTLR3_BITWORD FOLLOW_ID_in_proc_init278_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_proc_init278 = { FOLLOW_ID_in_proc_init278_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_proc_init280 */ -static ANTLR3_BITWORD FOLLOW_ID_in_proc_init280_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000200) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_proc_init280 = { FOLLOW_ID_in_proc_init280_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_numbered_ID_in_proc_init282 */ -static ANTLR3_BITWORD FOLLOW_numbered_ID_in_proc_init282_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; -static ANTLR3_BITSET_LIST FOLLOW_numbered_ID_in_proc_init282 = { FOLLOW_numbered_ID_in_proc_init282_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_SYNC_TOK_in_sync_def294 */ -static ANTLR3_BITWORD FOLLOW_SYNC_TOK_in_sync_def294_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_SYNC_TOK_in_sync_def294 = { FOLLOW_SYNC_TOK_in_sync_def294_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_sync_def296 */ -static ANTLR3_BITWORD FOLLOW_group_elements_in_sync_def296_bits[] = { ANTLR3_UINT64_LIT(0x0000000000080208) }; -static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_sync_def296 = { FOLLOW_group_elements_in_sync_def296_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_START_in_proc_start308 */ -static ANTLR3_BITWORD FOLLOW_START_in_proc_start308_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_START_in_proc_start308 = { FOLLOW_START_in_proc_start308_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_proc_start310 */ -static ANTLR3_BITWORD FOLLOW_ID_in_proc_start310_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_proc_start310 = { FOLLOW_ID_in_proc_start310_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_constraint_block_in_constraints327 */ -static ANTLR3_BITWORD FOLLOW_constraint_block_in_constraints327_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_constraint_block_in_constraints327 = { FOLLOW_constraint_block_in_constraints327_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_constraints332 */ -static ANTLR3_BITWORD FOLLOW_eq_in_constraints332_bits[] = { ANTLR3_UINT64_LIT(0x00000001BE8A0208) }; -static ANTLR3_BITSET_LIST FOLLOW_eq_in_constraints332 = { FOLLOW_eq_in_constraints332_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_live_def_in_constraints338 */ -static ANTLR3_BITWORD FOLLOW_live_def_in_constraints338_bits[] = { ANTLR3_UINT64_LIT(0x0000000180000008) }; -static ANTLR3_BITSET_LIST FOLLOW_live_def_in_constraints338 = { FOLLOW_live_def_in_constraints338_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_uncontrol_in_constraints341 */ -static ANTLR3_BITWORD FOLLOW_uncontrol_in_constraints341_bits[] = { ANTLR3_UINT64_LIT(0x0000000100000008) }; -static ANTLR3_BITSET_LIST FOLLOW_uncontrol_in_constraints341 = { FOLLOW_uncontrol_in_constraints341_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_unobserve_in_constraints344 */ -static ANTLR3_BITWORD FOLLOW_unobserve_in_constraints344_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_unobserve_in_constraints344 = { FOLLOW_unobserve_in_constraints344_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_constraint_block354 */ -static ANTLR3_BITWORD FOLLOW_ID_in_constraint_block354_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_constraint_block354 = { FOLLOW_ID_in_constraint_block354_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_relationalExpression_in_eq363 */ -static ANTLR3_BITWORD FOLLOW_relationalExpression_in_eq363_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_relationalExpression_in_eq363 = { FOLLOW_relationalExpression_in_eq363_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_EQS_OP_in_eq369 */ -static ANTLR3_BITWORD FOLLOW_EQS_OP_in_eq369_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_EQS_OP_in_eq369 = { FOLLOW_EQS_OP_in_eq369_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_eq371 */ -static ANTLR3_BITWORD FOLLOW_eq_in_eq371_bits[] = { ANTLR3_UINT64_LIT(0x00000001BE8A0208) }; -static ANTLR3_BITSET_LIST FOLLOW_eq_in_eq371 = { FOLLOW_eq_in_eq371_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_eq373 */ -static ANTLR3_BITWORD FOLLOW_eq_in_eq373_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_eq_in_eq373 = { FOLLOW_eq_in_eq373_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_relationalExpression389 */ -static ANTLR3_BITWORD FOLLOW_additiveExpression_in_relationalExpression389_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_relationalExpression389 = { FOLLOW_additiveExpression_in_relationalExpression389_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_EQ_OP_in_relationalExpression398 */ -static ANTLR3_BITWORD FOLLOW_EQ_OP_in_relationalExpression398_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_EQ_OP_in_relationalExpression398 = { FOLLOW_EQ_OP_in_relationalExpression398_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_relationalExpression_in_relationalExpression400 */ -static ANTLR3_BITWORD FOLLOW_relationalExpression_in_relationalExpression400_bits[] = { ANTLR3_UINT64_LIT(0x000000001C8A0208) }; -static ANTLR3_BITSET_LIST FOLLOW_relationalExpression_in_relationalExpression400 = { FOLLOW_relationalExpression_in_relationalExpression400_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_relationalExpression_in_relationalExpression404 */ -static ANTLR3_BITWORD FOLLOW_relationalExpression_in_relationalExpression404_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_relationalExpression_in_relationalExpression404 = { FOLLOW_relationalExpression_in_relationalExpression404_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_primary_in_additiveExpression425 */ -static ANTLR3_BITWORD FOLLOW_primary_in_additiveExpression425_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_primary_in_additiveExpression425 = { FOLLOW_primary_in_additiveExpression425_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_PLUS_in_additiveExpression435 */ -static ANTLR3_BITWORD FOLLOW_PLUS_in_additiveExpression435_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_PLUS_in_additiveExpression435 = { FOLLOW_PLUS_in_additiveExpression435_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression439 */ -static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression439_bits[] = { ANTLR3_UINT64_LIT(0x00000000188A0208) }; -static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression439 = { FOLLOW_additiveExpression_in_additiveExpression439_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression456 */ -static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression456_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression456 = { FOLLOW_additiveExpression_in_additiveExpression456_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_MINUS_in_additiveExpression506 */ -static ANTLR3_BITWORD FOLLOW_MINUS_in_additiveExpression506_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_MINUS_in_additiveExpression506 = { FOLLOW_MINUS_in_additiveExpression506_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression510 */ -static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression510_bits[] = { ANTLR3_UINT64_LIT(0x00000000188A0208) }; -static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression510 = { FOLLOW_additiveExpression_in_additiveExpression510_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression526 */ -static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression526_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression526 = { FOLLOW_additiveExpression_in_additiveExpression526_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_MINUS_in_primary587 */ -static ANTLR3_BITWORD FOLLOW_MINUS_in_primary587_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_MINUS_in_primary587 = { FOLLOW_MINUS_in_primary587_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_primary591 */ -static ANTLR3_BITWORD FOLLOW_eq_in_primary591_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_eq_in_primary591 = { FOLLOW_eq_in_primary591_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_primary608 */ -static ANTLR3_BITWORD FOLLOW_ID_in_primary608_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_primary608 = { FOLLOW_ID_in_primary608_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_primary655 */ -static ANTLR3_BITWORD FOLLOW_group_elements_in_primary655_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_primary655 = { FOLLOW_group_elements_in_primary655_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_number_in_primary696 */ -static ANTLR3_BITWORD FOLLOW_number_in_primary696_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_number_in_primary696 = { FOLLOW_number_in_primary696_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_MULT_in_primary705 */ -static ANTLR3_BITWORD FOLLOW_MULT_in_primary705_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_MULT_in_primary705 = { FOLLOW_MULT_in_primary705_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_number_in_primary707 */ -static ANTLR3_BITWORD FOLLOW_number_in_primary707_bits[] = { ANTLR3_UINT64_LIT(0x00000000108A0208) }; -static ANTLR3_BITSET_LIST FOLLOW_number_in_primary707 = { FOLLOW_number_in_primary707_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_primary_in_primary709 */ -static ANTLR3_BITWORD FOLLOW_primary_in_primary709_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_primary_in_primary709 = { FOLLOW_primary_in_primary709_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_MULT_in_primary744 */ -static ANTLR3_BITWORD FOLLOW_MULT_in_primary744_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_MULT_in_primary744 = { FOLLOW_MULT_in_primary744_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_number_in_primary746 */ -static ANTLR3_BITWORD FOLLOW_number_in_primary746_bits[] = { ANTLR3_UINT64_LIT(0x00000001BE8A0208) }; -static ANTLR3_BITSET_LIST FOLLOW_number_in_primary746 = { FOLLOW_number_in_primary746_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_primary750 */ -static ANTLR3_BITWORD FOLLOW_eq_in_primary750_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_eq_in_primary750 = { FOLLOW_eq_in_primary750_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_LIVE_in_live_def774 */ -static ANTLR3_BITWORD FOLLOW_LIVE_in_live_def774_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_LIVE_in_live_def774 = { FOLLOW_LIVE_in_live_def774_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ALL_in_live_def776 */ -static ANTLR3_BITWORD FOLLOW_ALL_in_live_def776_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; -static ANTLR3_BITSET_LIST FOLLOW_ALL_in_live_def776 = { FOLLOW_ALL_in_live_def776_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_live_def778 */ -static ANTLR3_BITWORD FOLLOW_ID_in_live_def778_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_live_def778 = { FOLLOW_ID_in_live_def778_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_LIVE_in_live_def786 */ -static ANTLR3_BITWORD FOLLOW_LIVE_in_live_def786_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_LIVE_in_live_def786 = { FOLLOW_LIVE_in_live_def786_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_live_def788 */ -static ANTLR3_BITWORD FOLLOW_ID_in_live_def788_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_live_def788 = { FOLLOW_ID_in_live_def788_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_UNCONTROL_in_uncontrol800 */ -static ANTLR3_BITWORD FOLLOW_UNCONTROL_in_uncontrol800_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_UNCONTROL_in_uncontrol800 = { FOLLOW_UNCONTROL_in_uncontrol800_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_uncontrol802 */ -static ANTLR3_BITWORD FOLLOW_ID_in_uncontrol802_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_uncontrol802 = { FOLLOW_ID_in_uncontrol802_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_UNOBSERVE_in_unobserve814 */ -static ANTLR3_BITWORD FOLLOW_UNOBSERVE_in_unobserve814_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_UNOBSERVE_in_unobserve814 = { FOLLOW_UNOBSERVE_in_unobserve814_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_unobserve816 */ -static ANTLR3_BITWORD FOLLOW_ID_in_unobserve816_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_unobserve816 = { FOLLOW_ID_in_unobserve816_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_print_in_other_commands828 */ -static ANTLR3_BITWORD FOLLOW_print_in_other_commands828_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_print_in_other_commands828 = { FOLLOW_print_in_other_commands828_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_PRINT_in_print838 */ -static ANTLR3_BITWORD FOLLOW_PRINT_in_print838_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_PRINT_in_print838 = { FOLLOW_PRINT_in_print838_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_print840 */ -static ANTLR3_BITWORD FOLLOW_ID_in_print840_bits[] = { ANTLR3_UINT64_LIT(0x0000000000080208) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_print840 = { FOLLOW_ID_in_print840_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_print842 */ -static ANTLR3_BITWORD FOLLOW_group_elements_in_print842_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_print842 = { FOLLOW_group_elements_in_print842_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_INT_in_number861 */ -static ANTLR3_BITWORD FOLLOW_INT_in_number861_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_INT_in_number861 = { FOLLOW_INT_in_number861_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_MINUS_in_number874 */ -static ANTLR3_BITWORD FOLLOW_MINUS_in_number874_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_MINUS_in_number874 = { FOLLOW_MINUS_in_number874_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_INT_in_number876 */ -static ANTLR3_BITWORD FOLLOW_INT_in_number876_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_INT_in_number876 = { FOLLOW_INT_in_number876_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_group_elements893 */ -static ANTLR3_BITWORD FOLLOW_ID_in_group_elements893_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_group_elements893 = { FOLLOW_ID_in_group_elements893_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_DOT_in_group_elements899 */ -static ANTLR3_BITWORD FOLLOW_DOT_in_group_elements899_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_DOT_in_group_elements899 = { FOLLOW_DOT_in_group_elements899_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_group_elements901 */ -static ANTLR3_BITWORD FOLLOW_group_elements_in_group_elements901_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000200) }; -static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_group_elements901 = { FOLLOW_group_elements_in_group_elements901_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_group_elements903 */ -static ANTLR3_BITWORD FOLLOW_ID_in_group_elements903_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_group_elements903 = { FOLLOW_ID_in_group_elements903_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_numbered_ID913 */ -static ANTLR3_BITWORD FOLLOW_ID_in_numbered_ID913_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_numbered_ID913 = { FOLLOW_ID_in_numbered_ID913_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_numbered_ID919 */ -static ANTLR3_BITWORD FOLLOW_ID_in_numbered_ID919_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; -static ANTLR3_BITSET_LIST FOLLOW_ID_in_numbered_ID919 = { FOLLOW_ID_in_numbered_ID919_bits, 1 }; -/** Bitset defining follow set for error recovery in rule state: FOLLOW_INT_in_numbered_ID921 */ -static ANTLR3_BITWORD FOLLOW_INT_in_numbered_ID921_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; -static ANTLR3_BITSET_LIST FOLLOW_INT_in_numbered_ID921 = { FOLLOW_INT_in_numbered_ID921_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_trans_defs_in_proc_definitions110 */ +static ANTLR3_BITWORD FOLLOW_trans_defs_in_proc_definitions110_bits[] = { ANTLR3_UINT64_LIT(0x0000100000100268) }; +static ANTLR3_BITSET_LIST FOLLOW_trans_defs_in_proc_definitions110 = { FOLLOW_trans_defs_in_proc_definitions110_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_select_functions_in_proc_definitions113 */ +static ANTLR3_BITWORD FOLLOW_select_functions_in_proc_definitions113_bits[] = { ANTLR3_UINT64_LIT(0x0000100000100008) }; +static ANTLR3_BITSET_LIST FOLLOW_select_functions_in_proc_definitions113 = { FOLLOW_select_functions_in_proc_definitions113_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_nondeterm_in_proc_definitions116 */ +static ANTLR3_BITWORD FOLLOW_nondeterm_in_proc_definitions116_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_nondeterm_in_proc_definitions116 = { FOLLOW_nondeterm_in_proc_definitions116_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_def_start127 */ +static ANTLR3_BITWORD FOLLOW_ID_in_def_start127_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_def_start127 = { FOLLOW_ID_in_def_start127_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_extern_trans_def_in_trans_defs135 */ +static ANTLR3_BITWORD FOLLOW_extern_trans_def_in_trans_defs135_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_extern_trans_def_in_trans_defs135 = { FOLLOW_extern_trans_def_in_trans_defs135_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_trans_def_in_trans_defs140 */ +static ANTLR3_BITWORD FOLLOW_trans_def_in_trans_defs140_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_trans_def_in_trans_defs140 = { FOLLOW_trans_def_in_trans_defs140_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_TO_in_extern_trans_def150 */ +static ANTLR3_BITWORD FOLLOW_TO_in_extern_trans_def150_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_TO_in_extern_trans_def150 = { FOLLOW_TO_in_extern_trans_def150_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_extern_trans_def152 */ +static ANTLR3_BITWORD FOLLOW_ID_in_extern_trans_def152_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_extern_trans_def152 = { FOLLOW_ID_in_extern_trans_def152_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_FROM_in_extern_trans_def160 */ +static ANTLR3_BITWORD FOLLOW_FROM_in_extern_trans_def160_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_FROM_in_extern_trans_def160 = { FOLLOW_FROM_in_extern_trans_def160_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_extern_trans_def162 */ +static ANTLR3_BITWORD FOLLOW_ID_in_extern_trans_def162_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_extern_trans_def162 = { FOLLOW_ID_in_extern_trans_def162_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_trans_def174 */ +static ANTLR3_BITWORD FOLLOW_ID_in_trans_def174_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_trans_def174 = { FOLLOW_ID_in_trans_def174_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_CODE_BLOCK_in_trans_def176 */ +static ANTLR3_BITWORD FOLLOW_CODE_BLOCK_in_trans_def176_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_CODE_BLOCK_in_trans_def176 = { FOLLOW_CODE_BLOCK_in_trans_def176_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_trans_def183 */ +static ANTLR3_BITWORD FOLLOW_ID_in_trans_def183_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_trans_def183 = { FOLLOW_ID_in_trans_def183_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_trans_def185 */ +static ANTLR3_BITWORD FOLLOW_ID_in_trans_def185_bits[] = { ANTLR3_UINT64_LIT(0x0000000000001208) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_trans_def185 = { FOLLOW_ID_in_trans_def185_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_CODE_BLOCK_in_trans_def188 */ +static ANTLR3_BITWORD FOLLOW_CODE_BLOCK_in_trans_def188_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_CODE_BLOCK_in_trans_def188 = { FOLLOW_CODE_BLOCK_in_trans_def188_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_SELECT_DEF_in_select_functions199 */ +static ANTLR3_BITWORD FOLLOW_SELECT_DEF_in_select_functions199_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_SELECT_DEF_in_select_functions199 = { FOLLOW_SELECT_DEF_in_select_functions199_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_select_functions201 */ +static ANTLR3_BITWORD FOLLOW_ID_in_select_functions201_bits[] = { ANTLR3_UINT64_LIT(0x0000000000001000) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_select_functions201 = { FOLLOW_ID_in_select_functions201_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_CODE_BLOCK_in_select_functions203 */ +static ANTLR3_BITWORD FOLLOW_CODE_BLOCK_in_select_functions203_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_CODE_BLOCK_in_select_functions203 = { FOLLOW_CODE_BLOCK_in_select_functions203_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_44_in_nondeterm214 */ +static ANTLR3_BITWORD FOLLOW_44_in_nondeterm214_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_44_in_nondeterm214 = { FOLLOW_44_in_nondeterm214_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_nondeterm216 */ +static ANTLR3_BITWORD FOLLOW_ID_in_nondeterm216_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_nondeterm216 = { FOLLOW_ID_in_nondeterm216_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_proc_init_in_proc_instantiations228 */ +static ANTLR3_BITWORD FOLLOW_proc_init_in_proc_instantiations228_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_proc_init_in_proc_instantiations228 = { FOLLOW_proc_init_in_proc_instantiations228_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_sync_def_in_proc_instantiations232 */ +static ANTLR3_BITWORD FOLLOW_sync_def_in_proc_instantiations232_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_sync_def_in_proc_instantiations232 = { FOLLOW_sync_def_in_proc_instantiations232_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_proc_start_in_proc_instantiations236 */ +static ANTLR3_BITWORD FOLLOW_proc_start_in_proc_instantiations236_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_proc_start_in_proc_instantiations236 = { FOLLOW_proc_start_in_proc_instantiations236_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_proc_init246 */ +static ANTLR3_BITWORD FOLLOW_ID_in_proc_init246_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_proc_init246 = { FOLLOW_ID_in_proc_init246_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_proc_init248 */ +static ANTLR3_BITWORD FOLLOW_ID_in_proc_init248_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000200) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_proc_init248 = { FOLLOW_ID_in_proc_init248_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_numbered_ID_in_proc_init250 */ +static ANTLR3_BITWORD FOLLOW_numbered_ID_in_proc_init250_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; +static ANTLR3_BITSET_LIST FOLLOW_numbered_ID_in_proc_init250 = { FOLLOW_numbered_ID_in_proc_init250_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_SYNC_TOK_in_sync_def262 */ +static ANTLR3_BITWORD FOLLOW_SYNC_TOK_in_sync_def262_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_SYNC_TOK_in_sync_def262 = { FOLLOW_SYNC_TOK_in_sync_def262_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_sync_def264 */ +static ANTLR3_BITWORD FOLLOW_group_elements_in_sync_def264_bits[] = { ANTLR3_UINT64_LIT(0x0000000000080208) }; +static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_sync_def264 = { FOLLOW_group_elements_in_sync_def264_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_START_in_proc_start276 */ +static ANTLR3_BITWORD FOLLOW_START_in_proc_start276_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_START_in_proc_start276 = { FOLLOW_START_in_proc_start276_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_proc_start278 */ +static ANTLR3_BITWORD FOLLOW_ID_in_proc_start278_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_proc_start278 = { FOLLOW_ID_in_proc_start278_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_constraint_block_in_constraints295 */ +static ANTLR3_BITWORD FOLLOW_constraint_block_in_constraints295_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_constraint_block_in_constraints295 = { FOLLOW_constraint_block_in_constraints295_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_constraints300 */ +static ANTLR3_BITWORD FOLLOW_eq_in_constraints300_bits[] = { ANTLR3_UINT64_LIT(0x00000001BE8A0208) }; +static ANTLR3_BITSET_LIST FOLLOW_eq_in_constraints300 = { FOLLOW_eq_in_constraints300_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_live_def_in_constraints306 */ +static ANTLR3_BITWORD FOLLOW_live_def_in_constraints306_bits[] = { ANTLR3_UINT64_LIT(0x0000000180000008) }; +static ANTLR3_BITSET_LIST FOLLOW_live_def_in_constraints306 = { FOLLOW_live_def_in_constraints306_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_uncontrol_in_constraints309 */ +static ANTLR3_BITWORD FOLLOW_uncontrol_in_constraints309_bits[] = { ANTLR3_UINT64_LIT(0x0000000100000008) }; +static ANTLR3_BITSET_LIST FOLLOW_uncontrol_in_constraints309 = { FOLLOW_uncontrol_in_constraints309_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_unobserve_in_constraints312 */ +static ANTLR3_BITWORD FOLLOW_unobserve_in_constraints312_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_unobserve_in_constraints312 = { FOLLOW_unobserve_in_constraints312_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_constraint_block322 */ +static ANTLR3_BITWORD FOLLOW_ID_in_constraint_block322_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_constraint_block322 = { FOLLOW_ID_in_constraint_block322_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_relationalExpression_in_eq331 */ +static ANTLR3_BITWORD FOLLOW_relationalExpression_in_eq331_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_relationalExpression_in_eq331 = { FOLLOW_relationalExpression_in_eq331_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_EQS_OP_in_eq337 */ +static ANTLR3_BITWORD FOLLOW_EQS_OP_in_eq337_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_EQS_OP_in_eq337 = { FOLLOW_EQS_OP_in_eq337_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_eq339 */ +static ANTLR3_BITWORD FOLLOW_eq_in_eq339_bits[] = { ANTLR3_UINT64_LIT(0x00000001BE8A0208) }; +static ANTLR3_BITSET_LIST FOLLOW_eq_in_eq339 = { FOLLOW_eq_in_eq339_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_eq341 */ +static ANTLR3_BITWORD FOLLOW_eq_in_eq341_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_eq_in_eq341 = { FOLLOW_eq_in_eq341_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_relationalExpression357 */ +static ANTLR3_BITWORD FOLLOW_additiveExpression_in_relationalExpression357_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_relationalExpression357 = { FOLLOW_additiveExpression_in_relationalExpression357_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_EQ_OP_in_relationalExpression366 */ +static ANTLR3_BITWORD FOLLOW_EQ_OP_in_relationalExpression366_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_EQ_OP_in_relationalExpression366 = { FOLLOW_EQ_OP_in_relationalExpression366_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_relationalExpression_in_relationalExpression368 */ +static ANTLR3_BITWORD FOLLOW_relationalExpression_in_relationalExpression368_bits[] = { ANTLR3_UINT64_LIT(0x000000001C8A0208) }; +static ANTLR3_BITSET_LIST FOLLOW_relationalExpression_in_relationalExpression368 = { FOLLOW_relationalExpression_in_relationalExpression368_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_relationalExpression_in_relationalExpression372 */ +static ANTLR3_BITWORD FOLLOW_relationalExpression_in_relationalExpression372_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_relationalExpression_in_relationalExpression372 = { FOLLOW_relationalExpression_in_relationalExpression372_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_primary_in_additiveExpression393 */ +static ANTLR3_BITWORD FOLLOW_primary_in_additiveExpression393_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_primary_in_additiveExpression393 = { FOLLOW_primary_in_additiveExpression393_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_PLUS_in_additiveExpression403 */ +static ANTLR3_BITWORD FOLLOW_PLUS_in_additiveExpression403_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_PLUS_in_additiveExpression403 = { FOLLOW_PLUS_in_additiveExpression403_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression407 */ +static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression407_bits[] = { ANTLR3_UINT64_LIT(0x00000000188A0208) }; +static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression407 = { FOLLOW_additiveExpression_in_additiveExpression407_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression424 */ +static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression424_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression424 = { FOLLOW_additiveExpression_in_additiveExpression424_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_MINUS_in_additiveExpression474 */ +static ANTLR3_BITWORD FOLLOW_MINUS_in_additiveExpression474_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_MINUS_in_additiveExpression474 = { FOLLOW_MINUS_in_additiveExpression474_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression478 */ +static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression478_bits[] = { ANTLR3_UINT64_LIT(0x00000000188A0208) }; +static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression478 = { FOLLOW_additiveExpression_in_additiveExpression478_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression494 */ +static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression494_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression494 = { FOLLOW_additiveExpression_in_additiveExpression494_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_MINUS_in_primary555 */ +static ANTLR3_BITWORD FOLLOW_MINUS_in_primary555_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_MINUS_in_primary555 = { FOLLOW_MINUS_in_primary555_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_primary559 */ +static ANTLR3_BITWORD FOLLOW_eq_in_primary559_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_eq_in_primary559 = { FOLLOW_eq_in_primary559_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_primary576 */ +static ANTLR3_BITWORD FOLLOW_ID_in_primary576_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_primary576 = { FOLLOW_ID_in_primary576_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_primary623 */ +static ANTLR3_BITWORD FOLLOW_group_elements_in_primary623_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_primary623 = { FOLLOW_group_elements_in_primary623_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_number_in_primary664 */ +static ANTLR3_BITWORD FOLLOW_number_in_primary664_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_number_in_primary664 = { FOLLOW_number_in_primary664_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_MULT_in_primary673 */ +static ANTLR3_BITWORD FOLLOW_MULT_in_primary673_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_MULT_in_primary673 = { FOLLOW_MULT_in_primary673_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_number_in_primary675 */ +static ANTLR3_BITWORD FOLLOW_number_in_primary675_bits[] = { ANTLR3_UINT64_LIT(0x00000000108A0208) }; +static ANTLR3_BITSET_LIST FOLLOW_number_in_primary675 = { FOLLOW_number_in_primary675_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_primary_in_primary677 */ +static ANTLR3_BITWORD FOLLOW_primary_in_primary677_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_primary_in_primary677 = { FOLLOW_primary_in_primary677_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_MULT_in_primary712 */ +static ANTLR3_BITWORD FOLLOW_MULT_in_primary712_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_MULT_in_primary712 = { FOLLOW_MULT_in_primary712_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_number_in_primary714 */ +static ANTLR3_BITWORD FOLLOW_number_in_primary714_bits[] = { ANTLR3_UINT64_LIT(0x00000001BE8A0208) }; +static ANTLR3_BITSET_LIST FOLLOW_number_in_primary714 = { FOLLOW_number_in_primary714_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_primary718 */ +static ANTLR3_BITWORD FOLLOW_eq_in_primary718_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_eq_in_primary718 = { FOLLOW_eq_in_primary718_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_LIVE_in_live_def742 */ +static ANTLR3_BITWORD FOLLOW_LIVE_in_live_def742_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_LIVE_in_live_def742 = { FOLLOW_LIVE_in_live_def742_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ALL_in_live_def744 */ +static ANTLR3_BITWORD FOLLOW_ALL_in_live_def744_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; +static ANTLR3_BITSET_LIST FOLLOW_ALL_in_live_def744 = { FOLLOW_ALL_in_live_def744_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_live_def746 */ +static ANTLR3_BITWORD FOLLOW_ID_in_live_def746_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_live_def746 = { FOLLOW_ID_in_live_def746_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_LIVE_in_live_def754 */ +static ANTLR3_BITWORD FOLLOW_LIVE_in_live_def754_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_LIVE_in_live_def754 = { FOLLOW_LIVE_in_live_def754_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_live_def756 */ +static ANTLR3_BITWORD FOLLOW_ID_in_live_def756_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_live_def756 = { FOLLOW_ID_in_live_def756_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_UNCONTROL_in_uncontrol768 */ +static ANTLR3_BITWORD FOLLOW_UNCONTROL_in_uncontrol768_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_UNCONTROL_in_uncontrol768 = { FOLLOW_UNCONTROL_in_uncontrol768_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_uncontrol770 */ +static ANTLR3_BITWORD FOLLOW_ID_in_uncontrol770_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_uncontrol770 = { FOLLOW_ID_in_uncontrol770_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_UNOBSERVE_in_unobserve782 */ +static ANTLR3_BITWORD FOLLOW_UNOBSERVE_in_unobserve782_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_UNOBSERVE_in_unobserve782 = { FOLLOW_UNOBSERVE_in_unobserve782_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_unobserve784 */ +static ANTLR3_BITWORD FOLLOW_ID_in_unobserve784_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000208) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_unobserve784 = { FOLLOW_ID_in_unobserve784_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_print_in_other_commands796 */ +static ANTLR3_BITWORD FOLLOW_print_in_other_commands796_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_print_in_other_commands796 = { FOLLOW_print_in_other_commands796_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_PRINT_in_print806 */ +static ANTLR3_BITWORD FOLLOW_PRINT_in_print806_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_PRINT_in_print806 = { FOLLOW_PRINT_in_print806_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_print808 */ +static ANTLR3_BITWORD FOLLOW_ID_in_print808_bits[] = { ANTLR3_UINT64_LIT(0x0000000000080208) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_print808 = { FOLLOW_ID_in_print808_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_print810 */ +static ANTLR3_BITWORD FOLLOW_group_elements_in_print810_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_print810 = { FOLLOW_group_elements_in_print810_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_INT_in_number829 */ +static ANTLR3_BITWORD FOLLOW_INT_in_number829_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_INT_in_number829 = { FOLLOW_INT_in_number829_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_MINUS_in_number842 */ +static ANTLR3_BITWORD FOLLOW_MINUS_in_number842_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_MINUS_in_number842 = { FOLLOW_MINUS_in_number842_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_INT_in_number844 */ +static ANTLR3_BITWORD FOLLOW_INT_in_number844_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_INT_in_number844 = { FOLLOW_INT_in_number844_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_group_elements861 */ +static ANTLR3_BITWORD FOLLOW_ID_in_group_elements861_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_group_elements861 = { FOLLOW_ID_in_group_elements861_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_DOT_in_group_elements867 */ +static ANTLR3_BITWORD FOLLOW_DOT_in_group_elements867_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_DOT_in_group_elements867 = { FOLLOW_DOT_in_group_elements867_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_group_elements869 */ +static ANTLR3_BITWORD FOLLOW_group_elements_in_group_elements869_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000200) }; +static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_group_elements869 = { FOLLOW_group_elements_in_group_elements869_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_group_elements871 */ +static ANTLR3_BITWORD FOLLOW_ID_in_group_elements871_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_group_elements871 = { FOLLOW_ID_in_group_elements871_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_numbered_ID881 */ +static ANTLR3_BITWORD FOLLOW_ID_in_numbered_ID881_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_numbered_ID881 = { FOLLOW_ID_in_numbered_ID881_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_numbered_ID887 */ +static ANTLR3_BITWORD FOLLOW_ID_in_numbered_ID887_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) }; +static ANTLR3_BITSET_LIST FOLLOW_ID_in_numbered_ID887 = { FOLLOW_ID_in_numbered_ID887_bits, 1 }; +/** Bitset defining follow set for error recovery in rule state: FOLLOW_INT_in_numbered_ID889 */ +static ANTLR3_BITWORD FOLLOW_INT_in_numbered_ID889_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) }; +static ANTLR3_BITSET_LIST FOLLOW_INT_in_numbered_ID889 = { FOLLOW_INT_in_numbered_ID889_bits, 1 }; /** Bitset defining follow set for error recovery in rule state: FOLLOW_proc_instantiations_in_synpred2_pncompactor90 */ static ANTLR3_BITWORD FOLLOW_proc_instantiations_in_synpred2_pncompactor90_bits[] = { ANTLR3_UINT64_LIT(0x000000... [truncated message content] |
From: <com...@us...> - 2009-06-16 22:13:32
|
Revision: 61 http://pntool.svn.sourceforge.net/pntool/?rev=61&view=rev Author: compaqdrew Date: 2009-06-16 22:13:31 +0000 (Tue, 16 Jun 2009) Log Message: ----------- Updating license/readme Modified Paths: -------------- LICENSE.txt README.txt codegen/src/codegen.xcodeproj/drew.mode1v3 codegen/src/codegen.xcodeproj/drew.pbxuser Property Changed: ---------------- codegen/src/codegen.xcodeproj/drew.mode1v3 codegen/src/codegen.xcodeproj/drew.pbxuser Modified: LICENSE.txt =================================================================== --- LICENSE.txt 2009-06-16 20:37:33 UTC (rev 60) +++ LICENSE.txt 2009-06-16 22:13:31 UTC (rev 61) @@ -1,6 +1,7 @@ MILP solver released under the LGPL. (C) Respective authors. +ANTLR released under the BSD License. (C) Respective authors. -Copyright (c) 2009 LeTourneau University and University of Notre Dame +ACTS Copyright (c) 2009 LeTourneau University and University of Notre Dame ACTS is A Concurrency Tool Suite for concurrent programming and concurrent system design developed at LeTourneau University. The support of the National Science Fundation is gratefully acknowledged (NSF CNS-0834057). Modified: README.txt =================================================================== --- README.txt 2009-06-16 20:37:33 UTC (rev 60) +++ README.txt 2009-06-16 22:13:31 UTC (rev 61) @@ -4,6 +4,8 @@ Here's the directory structure: pnheaders - these files are maintained by Dr. Iordache. Codegen (and maybe others) compile against these libraries. +translator - this code takes a high-level-language spec and turns it into a pns datastructure. Maintained by Bion Oren. Uses ANTLR. +spnbox - this code generates supervisors? Maintained by Stephen Camp. Uses MILP solver. codegen - these files are maintained by Drew Crawford and Kris Eggert. This will become the code generating portion of the petri net. Feel free to add more directories! Track your code in here! \ No newline at end of file Property changes on: codegen/src/codegen.xcodeproj/drew.mode1v3 ___________________________________________________________________ Deleted: svn:executable - * Property changes on: codegen/src/codegen.xcodeproj/drew.pbxuser ___________________________________________________________________ Deleted: svn:executable - * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |