Wed Dec 19 22:57:42 2012 -0500: Miriam Melnick -- Implementing update
Wed Dec 19 22:29:57 2012 -0500: Miriam Melnick -- Fixing goFish.crd
Wed Dec 19 21:25:27 2012 -0500: Miriam Melnick -- Setting script to exit on first failure
Wed Dec 19 21:14:06 2012 -0500: Miriam Melnick -- Fixing cardigan script to compile cardigan to
Wed Dec 19 21:07:22 2012 -0500: Miriam Melnick -- working java code
Wed Dec 19 21:02:18 2012 -0500: Miriam Melnick -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Wed Dec 19 21:02:15 2012 -0500: Miriam Melnick -- CamelCasing
Wed Dec 19 20:38:06 2012 -0500: Skunkwaffle -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Wed Dec 19 20:37:56 2012 -0500: Skunkwaffle -- Go Fish
Wed Dec 19 20:33:39 2012 -0500: Muzi Gao -- add more comments
Wed Dec 19 20:00:30 2012 -0500: Miriam Melnick -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Wed Dec 19 20:00:25 2012 -0500: Miriam Melnick -- Java output files now have capitalized file names
Wed Dec 19 19:12:33 2012 -0500: Muzi Gao -- merge conflicts
Wed Dec 19 19:11:19 2012 -0500: Muzi Gao -- add comments, not finished
Wed Dec 19 18:56:29 2012 -0500: Miriam Melnick -- fixing the last non-parse error test. Starting on the parse error ones
Wed Dec 19 18:51:48 2012 -0500: Miriam Melnick -- Fixing tabs in rules statements
Wed Dec 19 18:40:21 2012 -0500: Miriam Melnick -- Fixing some more gold files
Wed Dec 19 18:25:18 2012 -0500: Miriam Melnick -- Tabbing
Wed Dec 19 17:57:12 2012 -0500: Miriam Melnick -- Fixed reversal problem for... 4th time?
Wed Dec 19 17:29:52 2012 -0500: Miriam Melnick -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Wed Dec 19 17:29:49 2012 -0500: Miriam Melnick -- Substituting main for play in the output
Wed Dec 19 17:27:25 2012 -0500: Muzi Gao -- print rule statement
Wed Dec 19 16:55:21 2012 -0500: Muzi Gao -- merge conflicts
Wed Dec 19 16:54:27 2012 -0500: Muzi Gao -- fixed collection function call
Wed Dec 19 16:49:31 2012 -0500: Miriam Melnick -- Fixing rules test
Wed Dec 19 16:34:53 2012 -0500: Miriam Melnick -- Fixing reversal issue
Wed Dec 19 16:27:10 2012 -0500: Muzi Gao -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Wed Dec 19 16:27:06 2012 -0500: Muzi Gao -- add collection function access test files
Wed Dec 19 16:26:16 2012 -0500: Miriam Melnick -- Updating gold files
Wed Dec 19 16:10:00 2012 -0500: Miriam Melnick -- Fixing testall
Wed Dec 19 15:52:44 2012 -0500: Miriam Melnick -- Fixing testall script
Wed Dec 19 15:44:14 2012 -0500: Miriam Melnick -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Wed Dec 19 15:44:09 2012 -0500: Miriam Melnick -- Saving java files that aren't auto-generated
Wed Dec 19 15:40:17 2012 -0500: Skunkwaffle -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Wed Dec 19 15:40:07 2012 -0500: Skunkwaffle -- Fixed newline issue... again
Wed Dec 19 15:27:50 2012 -0500: Miriam Melnick -- Adding Muzi's java files
Wed Dec 19 15:24:31 2012 -0500: Miriam Melnick -- Fixing name of cardigan output
Wed Dec 19 14:16:02 2012 -0500: Miriam Melnick -- public static void main
Wed Dec 19 13:49:06 2012 -0500: Miriam Melnick -- Muzi's java infrastructure
Wed Dec 19 13:37:20 2012 -0500: Skunkwaffle -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Wed Dec 19 13:37:14 2012 -0500: Skunkwaffle -- fixed newline issue
Wed Dec 19 13:07:18 2012 -0500: Miriam Melnick -- Working on structs
Wed Dec 19 12:44:16 2012 -0500: Miriam Melnick -- Renamed function call test since it didn't have a function call
Wed Dec 19 12:40:51 2012 -0500: Miriam Melnick -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Wed Dec 19 12:40:48 2012 -0500: Miriam Melnick -- Fixing output for struct
Wed Dec 19 12:32:05 2012 -0500: Muzi Gao -- merge conflicts
Wed Dec 19 12:19:37 2012 -0500: Muzi Gao -- remove decrement2.crd
Wed Dec 19 12:12:53 2012 -0500: Miriam Melnick -- Merge
Wed Dec 19 12:05:04 2012 -0500: Miriam Melnick -- Adding struct elements to symbol table
Wed Dec 19 12:01:15 2012 -0500: Muzi Gao -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Wed Dec 19 12:01:07 2012 -0500: Muzi Gao -- print property of structs, function call still needed
Wed Dec 19 11:40:21 2012 -0500: Miriam Melnick -- fixing test cases
Wed Dec 19 11:39:12 2012 -0500: Miriam Melnick -- Fixing a few tests
Wed Dec 19 02:34:40 2012 -0500: Muzi Gao -- merge conflict and add indeterminate type for collection-access
Wed Dec 19 01:51:05 2012 -0500: Muzi Gao -- fixing increment/decrement
Tue Dec 18 23:14:30 2012 -0500: Miriam Melnick -- Added currentFunction and untypedArgs
Tue Dec 18 22:15:04 2012 -0500: Miriam Melnick -- Functions can now return ids
Tue Dec 18 21:58:04 2012 -0500: Miriam Melnick -- Fixing some too-long lines
Tue Dec 18 21:51:12 2012 -0500: Muzi Gao -- merge conflict
Tue Dec 18 21:48:20 2012 -0500: Muzi Gao -- add access-enum
Tue Dec 18 21:45:15 2012 -0500: Miriam Melnick -- Fixed increment
Tue Dec 18 21:33:26 2012 -0500: Miriam Melnick -- Fixing order of block evaluation for the third time
Tue Dec 18 20:59:19 2012 -0500: Miriam Melnick -- Got argument types to update
Tue Dec 18 20:11:14 2012 -0500: Miriam Melnick -- fixing a typo in test script
Tue Dec 18 20:09:28 2012 -0500: Miriam Melnick -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Tue Dec 18 20:09:26 2012 -0500: Miriam Melnick -- Incrementing nestingLevel in control structures for scoping purposes
Tue Dec 18 20:07:19 2012 -0500: Muzi Gao -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Tue Dec 18 20:07:11 2012 -0500: Muzi Gao -- merge conflicts
Tue Dec 18 19:54:58 2012 -0500: Miriam Melnick -- Got return types working for functions if you return a literal. working on ids
Tue Dec 18 19:54:19 2012 -0500: Muzi Gao -- add collectionbounds
Tue Dec 18 19:28:56 2012 -0500: Miriam Melnick -- Starting to implement untypedArgs
Tue Dec 18 18:42:14 2012 -0500: Miriam Melnick -- Still working on function types - having some trouble with argument type assignment
Tue Dec 18 18:22:10 2012 -0500: Miriam Melnick -- Starting prepping for tabs in output
Tue Dec 18 18:10:56 2012 -0500: Miriam Melnick -- Added function return types and partial argument handling
Tue Dec 18 15:51:29 2012 -0500: Muzi Gao -- dealing with collection access
Tue Dec 18 15:50:38 2012 -0500: Miriam Melnick -- Now calling save_assignment_to_hash
Tue Dec 18 15:45:22 2012 -0500: Miriam Melnick -- Added a few more function comments
Tue Dec 18 15:34:01 2012 -0500: Miriam Melnick -- Adding comments to first few functions
Tue Dec 18 15:08:13 2012 -0500: Muzi Gao -- merge conflicts
Tue Dec 18 14:28:01 2012 -0500: Muzi Gao -- print for loop
Tue Dec 18 13:59:56 2012 -0500: Skunkwaffle -- Updated code to follow style guide
Tue Dec 18 12:32:14 2012 -0500: Miriam Melnick -- Fixed all warnings
Tue Dec 18 12:18:26 2012 -0500: Miriam Melnick -- All tests passing ecept those requiring function return types
Tue Dec 18 12:08:46 2012 -0500: Miriam Melnick -- Fixing binops - no longer evaluating in ocaml
Tue Dec 18 04:39:32 2012 -0500: Skunkwaffle -- handled all warnings
Mon Dec 17 16:59:47 2012 -0500: Miriam Melnick -- fixed invert/negate type errors
Mon Dec 17 16:22:53 2012 -0500: Miriam Melnick -- Fixing test script to catch runtime errors
Mon Dec 17 16:18:19 2012 -0500: Miriam Melnick -- Updated test script - shows all failed tests at bottom
Mon Dec 17 16:03:49 2012 -0500: Miriam Melnick -- Almost all tests passing
Mon Dec 17 15:56:53 2012 -0500: Miriam Melnick -- merge
Mon Dec 17 15:54:34 2012 -0500: Miriam Melnick -- ALL THE THINGS pass (well, almost)
Mon Dec 17 15:19:05 2012 -0500: Miriam Melnick -- Fixing semicolons
Mon Dec 17 14:57:49 2012 -0500: Miriam Melnick -- Results printing in right order and being added to table in right order. Many tests failing - fixing that now.
Mon Dec 17 14:48:12 2012 -0500: Muzi Gao -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Mon Dec 17 14:48:01 2012 -0500: Muzi Gao -- add ifstatement
Mon Dec 17 14:47:42 2012 -0500: Miriam Melnick -- finally doing things in the right order - will recommit soon with full solution.
Mon Dec 17 14:43:45 2012 -0500: Skunkwaffle -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Mon Dec 17 14:43:36 2012 -0500: Skunkwaffle -- Corrected newline handling after code block
Mon Dec 17 13:25:59 2012 -0500: Muzi Gao -- add while-statement test
Mon Dec 17 13:05:31 2012 -0500: Miriam Melnick -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Mon Dec 17 13:05:26 2012 -0500: Miriam Melnick -- Added geq and tests
Mon Dec 17 13:01:56 2012 -0500: Skunkwaffle -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Mon Dec 17 13:01:43 2012 -0500: Skunkwaffle -- Added support for multiple newlines
Mon Dec 17 12:56:12 2012 -0500: Miriam Melnick -- Renamed some tests
Mon Dec 17 12:49:27 2012 -0500: Miriam Melnick -- Fixed a couple of Nithin's tests
Mon Dec 17 12:43:16 2012 -0500: Miriam Melnick -- Changed cardigan.ml to use exclusively addVar and addFunc funtions
Mon Dec 17 12:32:05 2012 -0500: Miriam Melnick -- Using getVarType
Mon Dec 17 12:22:26 2012 -0500: Miriam Melnick -- All functions from semantic.ml now copied into cardigan.ml
Mon Dec 17 12:20:50 2012 -0500: Miriam Melnick -- Frec(args, returntype)
Mon Dec 17 12:16:16 2012 -0500: Miriam Melnick -- Adding more functions from semantic.ml to cardigan.ml
Mon Dec 17 12:09:08 2012 -0500: Miriam Melnick -- Removed enum form every Vrec. Now handling enums as all other derived types
Mon Dec 17 12:01:25 2012 -0500: Miriam Melnick -- Starting to integrate semantic.ml and cardigan.ml
Mon Dec 17 11:29:42 2012 -0500: Miriam Melnick -- Added gt
Mon Dec 17 11:26:04 2012 -0500: Miriam Melnick -- Implemented lt, neq
Mon Dec 17 06:01:10 2012 -0500: Skunkwaffle -- renamed test case
Sun Dec 16 23:02:21 2012 -0500: Miriam Melnick -- Implemented /,%,and,or. NOT currently works with the word 'not', not with the exclamation mark symbol
Sun Dec 16 22:36:08 2012 -0500: Miriam Melnick -- Just realized update (ex. +=) has not been implemented yet. Marked it as such.
Sun Dec 16 22:29:35 2012 -0500: Miriam Melnick -- Implemented +,-,*
Sun Dec 16 22:01:38 2012 -0500: Skunkwaffle -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Sun Dec 16 22:01:30 2012 -0500: Skunkwaffle -- WAR
Sun Dec 16 20:01:31 2012 -0500: Miriam Melnick -- Implementing negate, invert, increment, decrement
Sun Dec 16 03:09:32 2012 -0500: Muzi Gao -- merge conflicts
Sun Dec 16 03:02:51 2012 -0500: Muzi Gao -- fixed access collection, add input & output
Sun Dec 16 02:27:48 2012 -0500: Skunkwaffle -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Sun Dec 16 02:27:44 2012 -0500: Skunkwaffle -- Created external semantic analysis script
Sat Dec 15 23:19:25 2012 -0500: Miriam Melnick -- Fixed several warnings about partial function applications
Sat Dec 15 16:37:09 2012 -0500: Miriam Melnick -- Renaming tests to have valid names
Sat Dec 15 16:17:44 2012 -0500: Skunkwaffle -- fixed errors in cardigan.ml
Sat Dec 15 02:57:33 2012 -0500: Muzi Gao -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Sat Dec 15 02:57:26 2012 -0500: Muzi Gao -- deal with cast(x,y)
Fri Dec 14 21:55:59 2012 -0500: Nithin Chandrasekharan -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Fri Dec 14 20:50:01 2012 -0500: Skunkwaffle -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Fri Dec 14 20:49:52 2012 -0500: Skunkwaffle -- fixed backslash handling in strings
Fri Dec 14 20:18:33 2012 -0500: Nithin Chandrasekharan -- current edits for now
Fri Dec 14 20:05:12 2012 -0500: Nithin Chandrasekharan -- think i added new files
Fri Dec 14 19:56:34 2012 -0500: Nithin Chandrasekharan -- Edited type_of_expr in cardigan added some types
Fri Dec 14 19:24:18 2012 -0500: Skunkwaffle -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Fri Dec 14 19:24:14 2012 -0500: Skunkwaffle -- Input takes an argument now
Fri Dec 14 19:22:03 2012 -0500: Nithin Chandrasekharan -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Fri Dec 14 17:56:03 2012 -0500: Miriam Melnick -- Test script can now also check failures
Fri Dec 14 17:36:30 2012 -0500: Miriam Melnick -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Fri Dec 14 17:36:26 2012 -0500: Miriam Melnick -- Finished cast function
Fri Dec 14 16:09:48 2012 -0500: Skunkwaffle -- Final versions of scanner, parser, and ast
Fri Dec 14 15:52:44 2012 -0500: Skunkwaffle -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Fri Dec 14 15:52:39 2012 -0500: Skunkwaffle -- Added function calls
Fri Dec 14 15:50:58 2012 -0500: Miriam Melnick -- Testing string to float casting - it works
Fri Dec 14 15:46:12 2012 -0500: Miriam Melnick -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Fri Dec 14 15:46:08 2012 -0500: Miriam Melnick -- Cast string to int now working
Fri Dec 14 14:28:40 2012 -0500: Muzi Gao -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Fri Dec 14 14:28:30 2012 -0500: Muzi Gao -- nested collection
Fri Dec 14 14:14:43 2012 -0500: Skunkwaffle -- added for looooooooooops
Fri Dec 14 14:04:57 2012 -0500: Skunkwaffle -- Added rules
Fri Dec 14 13:49:27 2012 -0500: Skunkwaffle -- Added while
Fri Dec 14 13:35:33 2012 -0500: Skunkwaffle -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Fri Dec 14 13:35:26 2012 -0500: Skunkwaffle -- Added if/else if/else
Fri Dec 14 11:53:36 2012 -0500: Muzi Gao -- quick fix of enum
Fri Dec 14 11:48:15 2012 -0500: Miriam Melnick -- Putting Muzi's code back (sorry I deleted it)
Fri Dec 14 11:39:35 2012 -0500: Skunkwaffle -- Fixed shift/reduce conflicts
Fri Dec 14 11:33:31 2012 -0500: Miriam Melnick -- All primitive types can cast to themselves
Fri Dec 14 11:25:03 2012 -0500: Miriam Melnick -- Casting works from int to int
Fri Dec 14 11:11:06 2012 -0500: Miriam Melnick -- Adding a note to eval_block - when you call it, add the curly braces to the result of the function
Fri Dec 14 11:09:25 2012 -0500: Miriam Melnick -- Blocks no longer have tons of extra curly braces. All tests passing except enum (which I will fix soon).
Thu Dec 13 22:06:29 2012 -0500: Nithin Chandrasekharan -- Added basic tests
Thu Dec 13 22:01:38 2012 -0500: Nithin Chandrasekharan -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Thu Dec 13 17:46:58 2012 -0500: Muzi Gao -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Thu Dec 13 17:46:44 2012 -0500: Muzi Gao -- interpret enum object
Thu Dec 13 17:14:56 2012 -0500: Skunkwaffle -- added dot lookup and collection indexing
Thu Dec 13 16:52:56 2012 -0500: Skunkwaffle -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Thu Dec 13 16:52:51 2012 -0500: Skunkwaffle -- added return statemtn
Thu Dec 13 16:46:14 2012 -0500: Muzi Gao -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Thu Dec 13 16:46:06 2012 -0500: Muzi Gao -- merge conflicts
Thu Dec 13 16:43:54 2012 -0500: Skunkwaffle -- added increment and decrement
Thu Dec 13 16:34:05 2012 -0500: Skunkwaffle -- Added dummy code for binary op evaluation in interpereter
Thu Dec 13 16:29:37 2012 -0500: Muzi Gao -- interpret new collection object
Thu Dec 13 16:28:12 2012 -0500: Skunkwaffle -- Added binary operations
Thu Dec 13 16:07:24 2012 -0500: Skunkwaffle -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Thu Dec 13 16:07:19 2012 -0500: Skunkwaffle -- added unary negation, algebreic and boolean
Thu Dec 13 16:05:37 2012 -0500: Miriam Melnick -- Fixing typo causing syntax error
Thu Dec 13 16:04:07 2012 -0500: Miriam Melnick -- Merge with Josh's code
Thu Dec 13 16:03:00 2012 -0500: Miriam Melnick -- Passing a test with a function body. Outputting semicolons after stmts, braces around blocks.
Thu Dec 13 15:59:26 2012 -0500: Skunkwaffle -- Added OUTPUT function
Thu Dec 13 15:53:47 2012 -0500: Skunkwaffle -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Thu Dec 13 15:53:40 2012 -0500: Skunkwaffle -- added INPUT function
Thu Dec 13 15:49:26 2012 -0500: Miriam Melnick -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Thu Dec 13 15:49:20 2012 -0500: Miriam Melnick -- All tests pass. Statements are being evaluated and function bodies should be working
Thu Dec 13 15:35:57 2012 -0500: Skunkwaffle -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Thu Dec 13 15:35:52 2012 -0500: Skunkwaffle -- added CAST function
Thu Dec 13 14:39:18 2012 -0500: Nithin Chandrasekharan -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Thu Dec 13 14:27:56 2012 -0500: Miriam Melnick -- Changing java class names to have underscores instead of hyphens
Thu Dec 13 14:12:07 2012 -0500: Skunkwaffle -- conflict fix on cardigan.ml
Thu Dec 13 14:10:21 2012 -0500: Skunkwaffle -- added updates to parser with block and statement evaluation in interpreter
Thu Dec 13 14:03:20 2012 -0500: Muzi Gao -- add enum type in test-assign-enum.gold
Thu Dec 13 14:01:48 2012 -0500: Muzi Gao -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Thu Dec 13 14:00:18 2012 -0500: Muzi Gao -- adding javatype before variable assignment
Thu Dec 13 13:38:23 2012 -0500: Miriam Melnick -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Thu Dec 13 13:38:19 2012 -0500: Miriam Melnick -- Enums now working with symbol table.
Thu Dec 13 13:07:39 2012 -0500: Skunkwaffle -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Thu Dec 13 13:07:29 2012 -0500: Skunkwaffle -- Struct and parenthesized expressiong support in parser & ast
Thu Dec 13 12:54:00 2012 -0500: Muzi Gao -- add failure message for invalid type
Thu Dec 13 12:51:33 2012 -0500: Miriam Melnick -- Adding function type_of_variable to compiler
Thu Dec 13 12:34:25 2012 -0500: Skunkwaffle -- Added dummy enum handling to interpreter
Thu Dec 13 12:18:20 2012 -0500: Miriam Melnick -- Trying to merge
Thu Dec 13 12:17:08 2012 -0500: Miriam Melnick -- Adding symbol table to some eval functions
Thu Dec 13 12:10:55 2012 -0500: Skunkwaffle -- removing redundant code from the interpreter and ast
Thu Dec 13 11:35:28 2012 -0500: Nithin Chandrasekharan -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Thu Dec 13 11:31:45 2012 -0500: Miriam Melnick -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Thu Dec 13 11:31:42 2012 -0500: Miriam Melnick -- Removing that test; we decided it is an acceptable failure
Thu Dec 13 11:31:07 2012 -0500: Skunkwaffle -- Added Enum support in parser & ast
Thu Dec 13 11:18:12 2012 -0500: Miriam Melnick -- Comments working with one caveat: comments ended with newline do not yet include EOL. test-comment-backslash-trick demonstrates this failure. we should fix it.
Thu Dec 13 11:04:41 2012 -0500: Miriam Melnick -- Adding support for multi-line commands separated by backslash
Thu Dec 13 00:27:19 2012 -0500: Miriam Melnick -- Collection declaration now adds records to symbol table
Wed Dec 12 23:33:47 2012 -0500: Miriam Melnick -- Merging Josh's Collection changes
Wed Dec 12 23:06:22 2012 -0500: Skunkwaffle -- collection tests
Wed Dec 12 23:05:16 2012 -0500: Skunkwaffle -- Added Collection declaration. Interior values are not being added to the symbol table
Wed Dec 12 22:35:58 2012 -0500: Skunkwaffle -- fixing conflict
Wed Dec 12 22:31:02 2012 -0500: Skunkwaffle -- Collection works in ast but not in symbol table
Wed Dec 12 22:26:30 2012 -0500: Miriam Melnick -- All tests pass -- yay. AST is being compiled in correct order.
Wed Dec 12 21:05:18 2012 -0500: Miriam Melnick -- Merge with Josh's code
Wed Dec 12 21:02:38 2012 -0500: Miriam Melnick -- Muzi and I got types working -- yay
Wed Dec 12 20:51:57 2012 -0500: Skunkwaffle -- Tests for mulit arg functions
Wed Dec 12 20:49:07 2012 -0500: Skunkwaffle -- funciton definitions with arguments
Wed Dec 12 20:00:35 2012 -0500: Skunkwaffle -- Added function assignment with no arguments and empty block
Wed Dec 12 19:39:49 2012 -0500: Miriam Melnick -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Wed Dec 12 19:39:37 2012 -0500: Miriam Melnick -- Added print hash functionality for symbol table
Wed Dec 12 19:16:00 2012 -0500: Skunkwaffle -- Fixex prior conflict
Wed Dec 12 19:13:21 2012 -0500: Skunkwaffle -- Fake functions are allowed
Wed Dec 12 19:09:09 2012 -0500: Miriam Melnick -- Merging changes to cardigan.ml
Wed Dec 12 18:40:43 2012 -0500: Skunkwaffle -- Added assigning identifiers the value of other identifiers
Wed Dec 12 18:24:20 2012 -0500: Skunkwaffle -- Added assignment for all primative data types
Wed Dec 12 16:51:39 2012 -0500: Miriam Melnick -- Fixing Makefile and adding .java, .out, .diff to .gitignore
Wed Dec 12 16:48:39 2012 -0500: Miriam Melnick -- Merge branch 'java' of https://code.google.com/p/cardigan-plt into java
Wed Dec 12 16:47:35 2012 -0500: Miriam Melnick -- Renaming testall.sh to testall
Wed Dec 12 16:47:27 2012 -0500: Skunkwaffle -- Assignment tests
Wed Dec 12 16:36:50 2012 -0500: Skunkwaffle -- interpreter that ALMOST outputs valid jave code
Wed Dec 12 15:55:01 2012 -0500: Miriam Melnick -- Signalling which file passed testall.sh
Wed Dec 12 15:50:35 2012 -0500: Miriam Melnick -- Test script now compares .java to .gold
Wed Dec 12 15:38:05 2012 -0500: Miriam Melnick -- Updating test script to keep java files
Wed Dec 12 14:52:34 2012 -0500: Skunkwaffle -- OMG it works
Wed Dec 12 14:39:16 2012 -0500: Nithin Chandrasekharan -- ast2.mli
Wed Dec 12 12:40:10 2012 -0500: Miriam Melnick -- New parser based on varAssignments
Wed Dec 12 12:06:54 2012 -0500: Miriam Melnick -- Welcome to java branch
Wed Dec 12 11:55:43 2012 -0500: Miriam Melnick -- Putting in UnaryNegInt as a temporary fix for UnaryNeg.
Wed Dec 12 04:11:14 2012 -0500: Josh Lopez -- fixed string handling in the scanner and added test case for escape chars
Sat Dec 8 22:37:57 2012 -0500: Nithin Chandrasekharan -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Sat Dec 8 22:33:13 2012 -0500: Nithin Chandrasekharan -- Have updated the types and also added string_of_exp
Wed Dec 5 17:52:36 2012 -0500: Miriam Melnick -- To test alternate ast, (1) change first line of parser to 'open Ast2' and (2) run make alt
Wed Dec 5 17:34:16 2012 -0500: Nithin Chandrasekharan -- Alt AST
Wed Dec 5 16:56:20 2012 -0500: Miriam Melnick -- Added parenexpr. That test and str are currently failing
Wed Dec 5 16:42:39 2012 -0500: Miriam Melnick -- Committing the tests I just added
Wed Dec 5 16:42:11 2012 -0500: Miriam Melnick -- Added tests for floats and bools
Wed Dec 5 16:27:11 2012 -0500: Miriam Melnick -- moved literals into their own type in AST
Wed Dec 5 16:16:59 2012 -0500: Miriam Melnick -- Adding comments to cardigan.ml
Wed Dec 5 15:40:02 2012 -0500: Miriam Melnick -- Got id test passing
Mon Dec 3 21:22:27 2012 -0500: Miriam Melnick -- Updated testall.sh. Made cardigan print out results of eval
Mon Dec 3 19:07:03 2012 -0500: Josh Lopez -- changed interpreter to output, well, something
Mon Dec 3 18:57:22 2012 -0500: Josh Lopez -- adding message to interpreter
Mon Dec 3 18:53:29 2012 -0500: Miriam Melnick -- It compilesgit status
Mon Dec 3 18:32:11 2012 -0500: Miriam Melnick -- Still getting some build errors
Mon Dec 3 17:52:06 2012 -0500: Josh Lopez -- interpreter that tries to use the ast
Mon Dec 3 17:37:55 2012 -0500: Miriam Melnick -- Temp changes; not working yet
Wed Nov 28 17:56:06 2012 -0500: Miriam Melnick -- Made progress on moving things from parser to ast. Not done yet.
Mon Nov 26 18:04:44 2012 -0500: Miriam Melnick -- moving things to the ast
Mon Nov 26 17:36:30 2012 -0500: Miriam Melnick -- Deleting old microc tests
Mon Nov 26 16:45:06 2012 -0500: Miriam Melnick -- Adding cardigan and *.class to .gitignore
Sun Nov 25 18:01:43 2012 -0500: Josh Lopez -- Added compiler script cardigan.ml and removed its exclude rule from .gitignore
Mon Nov 19 17:44:45 2012 -0500: Miriam Melnick -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Mon Nov 19 17:44:39 2012 -0500: Miriam Melnick -- adding enumStringOrId stringOrId to parser
Sat Nov 17 23:12:31 2012 -0500: Josh Lopez -- Added all symbols to scanner and updated parser
Mon Nov 12 23:10:37 2012 -0500: Miriam Melnick -- finished cleaning up parser
Mon Nov 12 22:41:21 2012 -0500: Miriam Melnick -- moving some more copies from parser into ast
Mon Nov 12 21:49:49 2012 -0500: Miriam Melnick -- starting to move copies from parser to ast
Mon Nov 12 18:08:20 2012 -0500: Miriam Melnick -- adding a comment to the scanner
Mon Nov 12 18:01:32 2012 -0500: Josh Lopez -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Mon Nov 12 18:01:17 2012 -0500: Josh Lopez -- scanner with comments
Mon Nov 12 17:59:29 2012 -0500: Josh Lopez -- Scanner with comments
Mon Nov 12 17:57:16 2012 -0500: Miriam Melnick -- now building the scanner too
Mon Nov 12 15:12:46 2012 -0500: Miriam Melnick -- adding float literals to scanner
Mon Nov 12 15:10:54 2012 -0500: Miriam Melnick -- Added string literals to scanner (for real).
Mon Nov 12 15:10:16 2012 -0500: Miriam Melnick -- Added string literals to scanner. Not yet hooked into rest of program.
Mon Nov 12 02:13:37 2012 -0500: Muzi Gao -- add dot to scanner
Mon Oct 29 17:32:23 2012 -0400: Miriam Melnick -- fixing shift/reduce error in collection declaration
Mon Oct 29 17:24:50 2012 -0400: Miriam Melnick -- fixed edge cases for collection declaration
Mon Oct 29 17:23:05 2012 -0400: Miriam Melnick -- fixing syntax for collections and allowing range syntax
Mon Oct 29 16:44:47 2012 -0400: Miriam Melnick -- allow empty collection
Mon Oct 29 16:42:54 2012 -0400: Miriam Melnick -- allow empty structs
Sat Oct 27 00:14:25 2012 -0400: Miriam Melnick -- fixing exprG
Sat Oct 27 00:12:19 2012 -0400: Miriam Melnick -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Sat Oct 27 00:12:14 2012 -0400: Miriam Melnick -- implementing unaryneg and cleaning things up
Sat Oct 27 00:01:17 2012 -0400: Miriam Melnick -- merging with Nithin's code
Fri Oct 26 23:51:01 2012 -0400: Miriam Melnick -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 23:50:57 2012 -0400: Miriam Melnick -- fixing typos INTerior in parser
Fri Oct 26 23:48:05 2012 -0400: Miriam Melnick -- got rid of all the not reduced errors
Fri Oct 26 23:44:07 2012 -0400: Miriam Melnick -- fewer rules not being reduced
Fri Oct 26 23:45:10 2012 -0400: Josh Lopez -- removed confilcts
Fri Oct 26 23:40:57 2012 -0400: Josh Lopez -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 23:40:53 2012 -0400: Josh Lopez -- boolean is now a comparison
Fri Oct 26 23:38:27 2012 -0400: Josh Lopez -- boolean is now a comparison
Fri Oct 26 23:35:43 2012 -0400: Miriam Melnick -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 23:35:39 2012 -0400: Miriam Melnick -- adding funcCall to binary ops
Fri Oct 26 23:29:18 2012 -0400: Muzi Gao -- merge Josh's conflicts
Fri Oct 26 23:28:49 2012 -0400: Josh Lopez -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 23:28:46 2012 -0400: Josh Lopez -- else structure
Fri Oct 26 23:26:15 2012 -0400: Muzi Gao -- add funcCall to binary comparision
Fri Oct 26 23:23:31 2012 -0400: Miriam Melnick -- adding rules structure
Fri Oct 26 22:52:35 2012 -0400: Miriam Melnick -- calling funcCall where appropriate
Fri Oct 26 22:50:19 2012 -0400: Miriam Melnick -- adding more expr forms
Fri Oct 26 22:48:19 2012 -0400: Miriam Melnick -- merge
Fri Oct 26 22:47:56 2012 -0400: Miriam Melnick -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 22:47:53 2012 -0400: Miriam Melnick -- fixing numOp to match ast
Fri Oct 26 22:47:03 2012 -0400: Muzi Gao -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 22:47:00 2012 -0400: Muzi Gao -- merge conflicts
Fri Oct 26 22:46:55 2012 -0400: Miriam Melnick -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 22:49:30 2012 -0400: Josh Lopez -- numop operators
Fri Oct 26 22:46:50 2012 -0400: Miriam Melnick -- adding valid exprs to the expr rule in parser
Fri Oct 26 22:44:44 2012 -0400: Muzi Gao -- add output strings to binary comparision
Fri Oct 26 22:43:51 2012 -0400: Miriam Melnick -- added numop
Fri Oct 26 22:41:22 2012 -0400: Muzi Gao -- merge Josh's work
Fri Oct 26 22:41:11 2012 -0400: Josh Lopez -- boolean fix
Fri Oct 26 22:40:14 2012 -0400: Josh Lopez -- unary negation
Fri Oct 26 22:39:40 2012 -0400: Miriam Melnick -- fixing merge
Fri Oct 26 22:39:12 2012 -0400: Muzi Gao -- binary comparision
Fri Oct 26 22:39:10 2012 -0400: Josh Lopez -- unary negation
Fri Oct 26 22:39:06 2012 -0400: Miriam Melnick -- some more binops
Fri Oct 26 22:37:03 2012 -0400: Josh Lopez -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 22:36:58 2012 -0400: Josh Lopez -- plus and mod binary operators
Fri Oct 26 22:35:15 2012 -0400: Miriam Melnick -- merging changes Josh/Miriam
Fri Oct 26 22:34:31 2012 -0400: Miriam Melnick -- added MINUS
Fri Oct 26 22:32:49 2012 -0400: Josh Lopez -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 22:32:37 2012 -0400: Josh Lopez -- some binary ops
Fri Oct 26 22:31:59 2012 -0400: Miriam Melnick -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 22:31:57 2012 -0400: Miriam Melnick -- maintaining consistency in parser
Fri Oct 26 22:28:01 2012 -0400: Miriam Melnick -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 22:27:59 2012 -0400: Miriam Melnick -- adding function calls
Fri Oct 26 22:23:47 2012 -0400: Josh Lopez -- dot lookup
Fri Oct 26 22:19:15 2012 -0400: Josh Lopez -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 22:19:12 2012 -0400: Josh Lopez -- collection index
Fri Oct 26 22:14:40 2012 -0400: Miriam Melnick -- starting expr in parser
Fri Oct 26 22:08:11 2012 -0400: Miriam Melnick -- allowing functions to have no args
Fri Oct 26 21:33:03 2012 -0400: Miriam Melnick -- function body block fix
Fri Oct 26 21:30:34 2012 -0400: Miriam Melnick -- Merging Muzi's changes
Fri Oct 26 21:29:30 2012 -0400: Miriam Melnick -- merging Nithin's changes
Fri Oct 26 21:28:38 2012 -0400: Muzi Gao -- fixed derivedType
Fri Oct 26 21:27:36 2012 -0400: Miriam Melnick -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 21:27:34 2012 -0400: Miriam Melnick -- Fixed shift/reduce conflict on block
Fri Oct 26 21:07:32 2012 -0400: Miriam Melnick -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 21:09:45 2012 -0400: Josh Lopez -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 21:09:21 2012 -0400: Josh Lopez -- struct fix
Fri Oct 26 21:07:23 2012 -0400: Miriam Melnick -- merge
Fri Oct 26 21:05:14 2012 -0400: Miriam Melnick -- Fixing I -> id
Fri Oct 26 20:58:24 2012 -0400: Muzi Gao -- derived type -- keep collection as placeholder now
Fri Oct 26 20:57:02 2012 -0400: Muzi Gao -- derived type -- keep collection as placeholder now
Fri Oct 26 20:56:56 2012 -0400: Miriam Melnick -- Resolving merge between Josh and Miriam
Fri Oct 26 20:55:05 2012 -0400: Muzi Gao -- derived type -- keep collection as placeholder now
Fri Oct 26 20:51:50 2012 -0400: Josh Lopez -- assignments
Fri Oct 26 20:51:44 2012 -0400: Miriam Melnick -- Merging Miriam's changes of the parser. Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 20:51:36 2012 -0400: Miriam Melnick -- Added stmt and block to parser
Fri Oct 26 20:49:56 2012 -0400: Josh Lopez -- assignment statements
Fri Oct 26 20:46:16 2012 -0400: Miriam Melnick -- adding *.output to gitignore
Fri Oct 26 20:45:41 2012 -0400: Miriam Melnick -- really merging
Fri Oct 26 20:45:15 2012 -0400: Miriam Melnick -- merge
Fri Oct 26 20:37:29 2012 -0400: Miriam Melnick -- trying again
Fri Oct 26 20:37:00 2012 -0400: Miriam Melnick -- Added block, stmt - with placeholders for A,E,W
Fri Oct 26 20:35:12 2012 -0400: Josh Lopez -- Added structs
Fri Oct 26 20:34:48 2012 -0400: Muzi Gao -- enum done
Fri Oct 26 20:34:01 2012 -0400: Muzi Gao -- enum done
Fri Oct 26 20:26:41 2012 -0400: Josh Lopez -- more tokens
Fri Oct 26 20:25:43 2012 -0400: Josh Lopez -- further tokens
Fri Oct 26 20:24:21 2012 -0400: Muzi Gao -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 20:22:05 2012 -0400: Muzi Gao -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 20:21:24 2012 -0400: Miriam Melnick -- adding more tokens
Fri Oct 26 20:19:03 2012 -0400: Josh Lopez -- token fix
Fri Oct 26 20:17:40 2012 -0400: Josh Lopez -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 20:17:31 2012 -0400: Josh Lopez -- more tokens
Fri Oct 26 20:16:28 2012 -0400: Muzi Gao -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 20:16:25 2012 -0400: Muzi Gao -- backup
Fri Oct 26 20:11:44 2012 -0400: Josh Lopez -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 20:11:35 2012 -0400: Josh Lopez -- Really added the parser info this time
Fri Oct 26 20:11:18 2012 -0400: Miriam Melnick -- got rid of 'never reduced' warnings in parser
Fri Oct 26 20:01:14 2012 -0400: Josh Lopez -- function identifiers
Fri Oct 26 20:01:01 2012 -0400: Miriam Melnick -- fixing gitignore
Fri Oct 26 19:57:26 2012 -0400: Josh Lopez -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 19:57:15 2012 -0400: Josh Lopez -- identifiers
Fri Oct 26 19:54:46 2012 -0400: Josh Lopez -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 19:52:03 2012 -0400: Muzi Gao -- get rid of testing lines in README
Fri Oct 26 19:51:11 2012 -0400: Muzi Gao -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Fri Oct 26 19:50:52 2012 -0400: Josh Lopez -- identifier
Fri Oct 26 19:50:14 2012 -0400: Muzi Gao -- just try pushing
Fri Oct 26 19:49:01 2012 -0400: Miriam Melnick -- Added literal to parser and simplified scanning of booleans.
Fri Oct 26 19:31:05 2012 -0400: Miriam Melnick -- ast now only contains cardigan stuff
Fri Oct 26 18:06:35 2012 -0400: Miriam Melnick -- Test environment while we are building ast and parser. Disconnected from actually running programs.
Fri Oct 26 17:51:15 2012 -0400: Josh Lopez -- added operators
Fri Oct 26 17:21:55 2012 -0400: Miriam Melnick -- Scanner now passes booleans as a boolean type with a value of true/false
Fri Oct 26 15:31:36 2012 -0400: Miriam Melnick -- Changed comments from microc style to cardigan style.
Fri Oct 26 15:12:25 2012 -0400: Miriam Melnick -- Changed name to cardigan in Makefile and changed all tests to .crd files
Fri Oct 26 14:42:37 2012 -0400: Miriam Melnick -- Fixed bug with booleans. Parser now builds with no warnings and tests pass.
Mon Oct 22 18:58:12 2012 -0400: Nithin -- collections update
Mon Oct 22 18:42:22 2012 -0400: Nithin -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Mon Oct 22 18:37:13 2012 -0400: Nithin -- Merge branch 'master' of https://code.google.com/p/cardigan-plt
Mon Oct 22 18:32:11 2012 -0400: Nithin -- loops
Mon Oct 22 18:26:28 2012 -0400: Nithin -- loops
Mon Oct 22 18:04:08 2012 -0400: Nithin -- Okay this should finally work
Fri Oct 26 23:04:48 2012 -0400: Miriam Melnick -- made parser a little more readable
Fri Oct 26 23:00:59 2012 -0400: Miriam Melnick -- simplifying fake expression rules
Fri Oct 26 22:59:56 2012 -0400: Miriam Melnick -- added comparison rule to parser
Fri Oct 26 22:58:18 2012 -0400: Miriam Melnick -- expr=D. sweet.
Mon Oct 22 18:03:03 2012 -0400: Nithin -- Okay this should finally work
Mon Oct 22 16:11:00 2012 -0400: Nithin -- hh
Sat Oct 20 18:42:12 2012 -0400: Miriam Melnick -- Added boolean true/false to scanner and parser. We do not yet have the parser accepting anything but integers, so I gave false the code 5000 and true the code 5001. Not great for readability, but sufficient (I think) to check the ambiguity of our grammar.
Mon Oct 8 18:47:36 2012 -0400: Miriam Melnick -- initial commit. Using microc base with the addition of the mod operator.