Absyn line tracking #224
Absyn line tracking #224
Conversation
|
Ping? |
d8e4d04
to
69f506f
Compare
source/src/BNFC/Backend/Java.hs
Outdated
| @@ -352,7 +353,7 @@ cf2AntlrLex' l = CF2Lex | |||
|
|
|||
| -- | CF -> PARSER GENERATION TOOL BRIDGE | |||
| -- | function translating the CF to an appropriate parser generation tool. | |||
| type CF2ParserFunction = String -> String -> CF -> SymEnv -> String | |||
| type CF2ParserFunction = String -> String -> CF -> Bool -> SymEnv -> String | |||
There was a problem hiding this comment.
Please don't use plain Bool. Define a 2-value data type with telling names instead. Or at least define a type synonym.
| @@ -53,8 +53,9 @@ type MetaVar = (String, Cat) | |||
|
|
|||
| -- | Creates the ANTLR parser grammar for this CF. | |||
| --The environment comes from CFtoAntlr4Lexer | |||
| cf2AntlrParse :: String -> String -> CF -> SymEnv -> String | |||
| cf2AntlrParse packageBase packageAbsyn cf env = unlines | |||
| --The bool is line numbering, which is currently not supported. | |||
There was a problem hiding this comment.
Put argument documentations down as haddock comments, i.e, a -- ^ comment following the argument type. See https://github.com/andreasabel/haskell-style-guide/blob/master/haskell-style.md
|
Thanks for the contribution! |
72634ac
to
424c85a
Compare
|
OK, Bool has been excised from the places where it was used previously, and the C++ Backend has been updated as well. I can change the name of the line numbering flag if you'd like, but at least it's not a boolean now. |
|
Thanks for the change. Er, sorry to harp on this, but |
424c85a
to
9a35bf0
Compare
|
OK, I named it RecordPositions. I even renamed all the 'ln' variables rp. Thanks grep and sed. |
|
The Travis failure is the same one that I've seen before about GHC versions. The 2 non-broken versions passed. |
This reverts commit a65a265. The location tracking of cup was really awful in 0.11a, so much so that tracking locations in the abstract syntax tree is basically impossible. Revert this commit and add a comment about the minimal version required when line numbering is requested. Verified that cup 0.11a is supported without line numbering.
Adds line numbers to the generated Absyn files with -l Adds cup support to record the line numbers as the Absyn tree is built. When compiled with line number support, the symbolFactory argument must now be supplied to the parser. All of the examples have been updated to reflect this. Later cup versions complain that the constructor without a symbol factory is deprecated. Without line numbering, passing the SymbolFactory to the constructor doesn't hurt anything.
Use datatypes instead of booleans. It makes it much more clear what the functions are expecting. Line numbering especially, as it needs to be threaded troughout for both C++ and Java.
9a35bf0
to
de1c5cd
Compare
|
I re-ran the tests and encountered some errors, that I've cleaned up with this push. Everything should be in good order. |
|
Thanks, I merged this. |
Adds support for line, column, offset tracking in the Abstract Syntax classes.
Because the location support in cup 0.11a is spotty, 0.11a is almost 12 years old, and location support didn't work until recently, I decided that for location support, we would require cup 0.11b-2014-06-11 or later. I verified that without the -l option, cup 0.11a can still process the resulting files.
2552ae9 contains some edits besides the reversion that allow it to work with 0.11a when line number support is off.
We'll have to work something out with travis to test the -l option only with a newish cup.