Neil Brown
5c4bf74a75
Added support (and tests) for case statements in the control-flow graph
2007-10-28 16:31:15 +00:00
Neil Brown
bd14ed56ba
Changed the edge-labelling scheme in the control-flow graph to have beginpar/endpar nodes with matching ids
2007-10-28 14:55:43 +00:00
Neil Brown
b6d525fbb8
Added tests for while loops in the control-flow graph
2007-10-28 12:39:26 +00:00
Neil Brown
cde83c83ae
Added the capability of outputting graphviz scripts representing control-flow graphs
2007-10-28 12:11:27 +00:00
Neil Brown
25f13e6c6f
Added more tests for the control-flow graph, for Specs in Structured items
2007-10-28 11:38:04 +00:00
Neil Brown
cf17814b98
Changed the types involved in the control-flow graph so that I can customise the Show implementation
2007-10-28 11:35:51 +00:00
Neil Brown
a0c54220e2
Added more tests for the Seq and Par blocks in the control-flow graph
2007-10-28 01:25:44 +00:00
Neil Brown
cb17d62018
Changed findMeta so that it now works when directly applied to a Meta tag
2007-10-28 01:23:10 +00:00
Neil Brown
d2e54ea483
Added another helper function to the Utils module
2007-10-28 01:22:55 +00:00
Neil Brown
aea462d41a
Fixed some bugs in the test harness for the control-flow graph
2007-10-28 00:36:27 +00:00
Neil Brown
fbd297e23e
Added more tests for the control-flow graph stuff (for basic Seq and Par blocks)
2007-10-28 00:13:15 +00:00
Neil Brown
9b1cd56050
Changed the identifiers/values on graph nodes in the control-flow graph to be produced monadically, and altered the tests accordingly
2007-10-27 23:59:33 +00:00
Neil Brown
8fa046798a
Tidied up and simplified the test code in FlowGraphTest to operate on lists of nodes/edges, rather than decomposing the graph
...
When you decompose a graph, each edge only appears once; on one of the nodes it is attached to. This meant our testing was not working properly.
The easier solution is to forget how the graph works underneath, get a list of nodes and a list of edges, then operate on those.
2007-10-27 23:56:44 +00:00
Neil Brown
f0c552663b
Added the initial implementation of a module (and tests) for generating a control-flow graph from an AST
...
This implementation needs to be changed; it currently uses Meta as a primary key for nodes, but that isn't valid.
2007-10-27 21:18:55 +00:00
Neil Brown
9fd67023b7
Added some new general helper functions to the Utils module.
2007-10-27 21:15:04 +00:00
Neil Brown
7f59eec189
Changed the C and C++ backends (and tests) to handle declarations with initialisers properly
2007-10-25 00:27:12 +00:00
Neil Brown
6b95827cab
Added an optional initialiser-expression to Declaration in the AST, and changed the rest of the code accordingly
2007-10-24 23:50:00 +00:00
Neil Brown
1f604781f5
Added an AST item for blanking mobiles
2007-10-24 20:50:44 +00:00
Neil Brown
31642036b7
Added support for the new AllocMobile item in the Types module
2007-10-24 19:31:07 +00:00
Neil Brown
00d48d27de
Added an AST Expression for allocating mobiles
2007-10-24 19:30:44 +00:00
Neil Brown
f68a6cd31d
Added cases for DerefVariable to some functions in Types
2007-10-24 15:57:03 +00:00
Neil Brown
f8006696b2
Added a dereferenced mobile item to Variable in the AST
2007-10-24 15:56:02 +00:00
Neil Brown
86054ba754
Added code for the Mobile types to the ShowCode module
2007-10-21 14:18:51 +00:00
Neil Brown
521730bf8b
Added the Mobile type to the AST
2007-10-21 14:15:56 +00:00
Neil Brown
f0fdc05ff3
Added a large hunk of code in ShowCode that allows us to print out occam programs using the right indentation.
...
The code is messy, and not quite finished, but for now it isn't actually being used. So I'm committing it, ready to be fixed up at a later date.
2007-10-18 09:33:37 +00:00
Neil Brown
acca3d03fd
Removed the A.Main item from the AST entirely
2007-10-17 13:43:40 +00:00
Neil Brown
3727307a78
Changed the shared passes to operate on Structured items, rather than Process items
2007-10-17 13:24:42 +00:00
Neil Brown
a25824b601
Changed the passes to be of type Pass, rather than A.Process -> PassM A.Process
2007-10-17 13:09:16 +00:00
Neil Brown
4d6d6dc555
Added a new function (checkTempVarTypes) to the TestUtil module
2007-10-10 23:11:35 +00:00
Neil Brown
a68ecfb24b
Added a new function (typeOfSpec) to the Types module
2007-10-10 23:10:46 +00:00
Neil Brown
c9da8942d5
Changed the default compilation mode from being just occam/Rain->C/C++ compilation to being occam/Rain->binary ("all-in-one") compilation
2007-10-09 00:41:13 +00:00
Neil Brown
c17cf0ce38
Added the first attempt at getting Tock to do an all-in-one compile, from occam/Rain all the way through into an executable binary
2007-10-08 21:18:07 +00:00
Neil Brown
f32471709d
Fixed a few small unescaped slashes that were confusing haddock
2007-10-02 14:55:19 +00:00
Neil Brown
c59c2ed5f6
Removed an unused function (simplifyType) from the Types module
2007-10-02 14:48:09 +00:00
Neil Brown
15ecb2b178
Added the -fwarn-type-defaults compiler option (for when integer literals are given a default type) and fixed the few warnings that arose from doing so
2007-09-27 13:29:16 +00:00
Neil Brown
38c409d378
Added the -fwarn-unused-imports compiler option to warn about unused imports, and then set about pruning and ordering (mostly in my code) the import lists for all the modules
2007-09-27 13:13:46 +00:00
Neil Brown
47052d5f39
Fixed a bug where the default cases were left out for the recent "genericised" functions in the Types module
2007-09-27 10:59:35 +00:00
Neil Brown
be676060b9
Added a new wait guard (that matches the Rain wait guards exactly) to the AST
2007-09-26 23:18:57 +00:00
Neil Brown
13584ed2cb
Added a wait statement to the AST, and added Rain tests for parsing wait statements
2007-09-26 23:00:09 +00:00
Neil Brown
c925774280
Changed the types code so that all the tests for the new Time type pass
2007-09-19 11:24:14 +00:00
Neil Brown
135a4d6bfd
Added a helper function for marking when a test is a Rain test (which means any test output will be displayed as Rain code, not as occam code)
2007-09-19 11:08:25 +00:00
Neil Brown
c6217865b9
Added the Time type, and the GetTime process to the AST, and added showOccam/showRain lines for the Time type
2007-09-19 10:20:40 +00:00
Neil Brown
629137443f
Scrapped some boilerplate in Types by changing a couple of functions (simplifyType, underlyingType) to use generics
2007-09-18 18:37:53 +00:00
Neil Brown
c899282873
Changed dieIO to print out context for the error when it is given a valid meta tag
2007-09-18 11:48:11 +00:00
Neil Brown
c97d1d00c8
Changed the error type from String to ErrorReport throughout the code
...
ErrorReport is of type (Maybe Meta, String), thereby adding an optional code position to error messages.
Die has been changed so that die and dieP are now implemented in terms of dieReport (:: ErrorReport -> m a). This involved changing less code than changing die to be of type ErrorReport -> m a. All that had to be changed directly was that Die instances now implement dieReport instead of die.
Any bits of code that "caught" errors has been changed so that it handles ErrorReport instead of String. This ErrorReport is eventually, in Main, passed to dieIO, which will soon be changed to read the file in and provide the context. Accordingly, MonadIO m has been added as a constraint to dieIO, and dieInternal has been changed to no longer use dieIO (because really we can't add the MonadIO constraint to dieInternal).
Various error messages have been changed. Notably, all instances of fail in ParseOccam have been changed to use die or, wherever possible, dieP. A similar thing has been done in EvalConstants and EvalLiterals.
2007-09-18 10:17:38 +00:00
Neil Brown
1baecd7955
Moved findMeta into the Metadata module
2007-09-18 09:50:45 +00:00
Neil Brown
deef9dd209
Added documentation to PrettyShow and ShowCode, along with an export list for the latter.
2007-09-17 17:51:49 +00:00
Neil Brown
75ae6fa36f
Removed an unused member of CompState (csLoadedFiles)
2007-09-17 17:42:48 +00:00
Adam Sampson
a78fb8e917
Add functions to pack Metas as string prefixes.
...
These will be useful for passing source positions through Parsec's string error
mechanism.
2007-09-17 23:05:47 +00:00
Neil Brown
1172bfd2a0
Added the pshowCode function that uses the ShowOccam and ShowRain classes to print out applicable parts of an AST
2007-09-17 10:38:30 +00:00