Commit Graph

424 Commits

Author SHA1 Message Date
Neil Brown
1f8bb0e44a Removed the genVariable' function from GenOps
Now that the C++ generator no longer overrides genVariable', it seems wise to remove it from the GenOps function dictionary.

You can call it via either genVariable or genVariableUnchecked anyway, so genVariable' is just used by the two former functions as implementation.  It can easily be put back into the dictionary later on, if that turns out to be necessary.
2007-10-03 16:57:03 +00:00
Neil Brown
9b96ea9899 Removed the C++CSP implementation of genVariable' by adding a new function (genDirectedVariable) that represents the only change from the C version (and added C and C++ version of genDirectedVariable accordingly) 2007-10-03 16:55:48 +00:00
Neil Brown
4111dd3cb7 Added a test for genArraySubscript, and made the C and C++ backends pass it 2007-10-03 16:43:07 +00:00
Neil Brown
91d9dcf3bc Changed the functions in GenerateCTest to have separate tests (rather than separate assertions) for C and C++
This makes it easier to see straight away if both the C and C++ tests are failing (previously only the C test would have shown up if it failed, masking the C++ failure temporarily, until the C test passed).
2007-10-03 16:21:05 +00:00
Neil Brown
80836c0074 Added more tests for the C backend (genArrayLiteralElems, genActual, genActuals) 2007-10-03 15:57:45 +00:00
Neil Brown
9260bb9177 Added an export list to the GenerateC module 2007-10-03 15:31:03 +00:00
Neil Brown
e17367edfa Simplified the GenOps by removing a function (genArrayAbbrev) that did not need to be in there 2007-10-03 15:23:32 +00:00
Neil Brown
8a2894893c Changed the GenerateC[PPCSP] modules to pass the current tests (just a matter of changing the spacing in the output) 2007-10-03 14:08:34 +00:00
Neil Brown
d985043d62 Added more tests to the GenerateCTest module (stop, and array-related tests) 2007-10-03 14:08:09 +00:00
Neil Brown
96ee8ae9bd Simplified the GenerateCTest module by changing the helper functions 2007-10-03 13:32:28 +00:00
Neil Brown
639b662a98 Starting making the spacing in the generated C and C++ code consistent, so that it passes the tests 2007-10-02 14:50:04 +00:00
Neil Brown
9fc166d819 Added the first group of tests for the C and C++ code generation backends 2007-10-02 14:49:31 +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
e2ab43af3f Tidied up the new BackendPassesTest module, removing some old code that was not intended to be in there, and tidying up the imports list 2007-09-27 13:13:07 +00:00
Neil Brown
8d95b65f00 Added support for the new AlternativeWait guards to the C backend
This was not as straightforward as the C++ backend.  CIF has no capability for supporting waiting *for* a specified time as an ALT guard; only waiting until (AFTER, in occam) a specified time.  This is further complicated by the fact that when you disable an ALT timer guard in CIF, you have to be able to supply the timeout value that you waited on in the enable sequence.

Therefore, I added a pass that transforms all WaitFor guards into WaitUntil guards, by declaring nonce time variables, getting the time, and adding on the delay that we want to wait for; these actions occur just before the ALT.

This new pass is in the new BackendPasses module, into which I also moved the identifyParProcs pass.  I also wrote tests for my new pass that live in the new BackendPassesTest module.
2007-09-27 11:48:04 +00:00
Neil Brown
4a0732629d Added support for the new AlternativeWait guard to the C++ backend 2007-09-27 10:05:31 +00:00
Neil Brown
41d4923e9c Added support for the new Wait process to the C and C++ backends 2007-09-26 23:18:21 +00:00
Neil Brown
b280158e26 Added code in the C and C++ backends for handling the new Time type and GetTime statements in the AST 2007-09-19 10:34:49 +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
3e342a621c Added ShowOccam and ShowRain type-classes, and changed existing code to use these new show methods in error messages
The function showCode shows code as either occam or Rain depending on the frontend.  This is then used by a formatCode function that acts similar to 
printf, which makes it easy to format error messages that use showCode.
2007-09-16 17:20:57 +00:00
Neil Brown
8af4a9f687 Added generation of forward declarations to the C and C++ backends.
These declarations are necessary for recursive functions/procs, so that the (forward) declarations are visible to the implementations.

Later on, the declarations could be moved into header files, which would allow multiple source files to be compiled (generating multiple header files) and linked together using the gcc linker.  Alternatively, external C/C++ programs could use code originally written in occam/Rain by including the header files.
2007-09-12 12:09:35 +00:00
Neil Brown
aefb02caa6 Added missing cases for A.DirectedVariable in the C and C++ backends 2007-09-12 10:17:15 +00:00
Neil Brown
2ff46a9041 Rearranged the Rain source files, renamed a couple of Rain files, and changed the Makefile accordingly. 2007-09-10 17:28:57 +00:00