Commit Graph

65 Commits

Author SHA1 Message Date
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
7d8f170b7d Added support for the #COMMENT directive to the occam parser 2007-10-15 17:12:53 +00:00
Neil Brown
d4a766c594 Changed the occam parser to use A.Several with an empty list for its terminator, rather than A.Main 2007-10-17 13:43:12 +00:00
Neil Brown
e582f5e508 Changed the terminator in Rain source files from A.Main to A.Several (with an empty list), and updated the tests accordingly 2007-10-17 13:42:13 +00:00
Neil Brown
1c858e112c Changed the occam and Rain parsers to return a Structured rather than a Process (which will simplify the generated ASTs) 2007-10-17 13:21:17 +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
028c27eb73 Rain: implemented type-checking for wait guards 2007-09-26 23:42:40 +00:00
Neil Brown
c38978c123 Rain: added tests for checking types in wait guards 2007-09-26 23:42:16 +00:00
Neil Brown
d79de5a936 Rain: implemented parsing of wait guards 2007-09-26 23:34:55 +00:00
Neil Brown
cbd2d04371 Rain: added tests for parsing wait guards 2007-09-26 23:34:42 +00:00
Neil Brown
a65953ad89 Rain: added type-checking for wait statements 2007-09-26 23:08:55 +00:00
Neil Brown
41ac788601 Rain: added tests for checking the types in wait statements 2007-09-26 23:08:37 +00:00
Neil Brown
5af96110c7 Rain: implemented the parsing of wait statements 2007-09-26 23:00:58 +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
a12d46401a Rain: implementing type checking for inputs inside alts 2007-09-26 22:37:32 +00:00
Neil Brown
5c827fdacb Rain: added testing for correct types in input statements in alts 2007-09-26 22:37:03 +00:00
Neil Brown
4cc0628757 Corrected the name of one of the RainTypesTest tests 2007-09-26 22:24:01 +00:00
Neil Brown
db4f05932b Fixed a conflict between the old time-related patches and the new alt patches 2007-09-26 21:39:16 +00:00
Neil Brown
769dc3c79a Rain: changed the if, while and each loops to require a block as their body, rather than just a statement. 2007-09-26 18:03:42 +00:00
Neil Brown
68c468fbea Rain: added the parsing of else (skip) guards in alts 2007-09-26 19:56:22 +00:00
Neil Brown
420839ef1e Rain: added tests for parsing else guards in alts 2007-09-26 19:56:11 +00:00
Neil Brown
9c87478110 Corrected a test number in ParseRainTest 2007-09-26 19:44:33 +00:00
Neil Brown
205b090cef Rain: implemented the parsing of alt statements 2007-09-26 19:40:04 +00:00
Neil Brown
9cfbed3c6e Rain: added tests for parsing alt statements 2007-09-26 19:39:37 +00:00
Neil Brown
1f298a8ff6 Rain: added parsing support for time 2007-09-19 12:04:11 +00:00
Neil Brown
ae262125da Rain: added parse tests for things related to time 2007-09-19 12:03:55 +00:00
Neil Brown
ebf3040367 Rain: tidied up ParseRain a little 2007-09-19 12:03:24 +00:00
Neil Brown
4e635d84ba Rain: added a pass for checking the types in GetTime processes 2007-09-19 11:36:55 +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
5eb149d598 Rain: added type-checker tests for the Time type 2007-09-19 11:23:41 +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
a4453fe3c3 Rain: changed parse errors to report using dieP (with a Meta position) instead of just dieIO 2007-09-17 11:18:38 +00:00
Neil Brown
d92e042159 Moved the functions for converting between Meta and SourcePos (from Parsec) into a common ParseUtils module 2007-09-17 11:15:17 +00:00
Adam Sampson
fd2109d548 Fix a dummy filename that I'd forgotten to change. 2007-09-17 23:12:23 +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
6c3864cdfd Rain: wired up the new type-checking passes 2007-09-16 12:09:22 +00:00
Neil Brown
c61f2ea617 Rain: added checks that types match in input and output statements 2007-09-16 11:46:01 +00:00
Neil Brown
337ad7fd32 Rain: added type-checking tests for if and while conditionals 2007-09-16 09:59:30 +00:00
Neil Brown
5354c99a4e Rain: added a function and tests for checking the types involved in assignments 2007-09-16 09:18:12 +00:00
Neil Brown
9ef8343c3a Rain: moved matchParamPass into RainTypes 2007-09-15 21:29:30 +00:00
Neil Brown
9965c7373e Rain: removed an outdated comment 2007-09-15 21:20:41 +00:00
Neil Brown
3301207a97 Rain: added more type-checkers tests, all of which pass 2007-09-15 21:19:16 +00:00
Neil Brown
15ce5fee06 Rain: added more type-checker tests and made them pass 2007-09-15 21:01:10 +00:00
Neil Brown
eeacaf1de4 Rain: added tests for type-checking monadic integer expressions, and made them pass 2007-09-15 20:30:41 +00:00
Neil Brown
a454aa78f8 Rain: implemented the checkExpression function and got it passing the tests so far 2007-09-15 18:57:02 +00:00
Neil Brown
7f9357d658 Rain: changed from using the isSafeConversion function to a more appropriate new function isImplicitConversionRain 2007-09-15 18:54:19 +00:00
Neil Brown
f9c21dc4c7 Rain: fixed a nasty copy-and-paste mistake in RainTypesTest 2007-09-15 18:35:13 +00:00
Neil Brown
feedce5a24 Removed unnecessary dependencies of a few non-test modules on TestUtil 2007-09-15 14:33:23 +00:00
Neil Brown
2bef926238 Tidied up and expanded the expression type-checker tests 2007-09-15 13:37:53 +00:00