diff --git a/TODO b/TODO index 5c962f5b..9c434c7c 100644 --- a/TODO +++ b/TODO @@ -171,9 +171,6 @@ class in the printers/destructors, which is not good for an operator<< since it is no longer bound to a particular parser, it's just a (standalone symbol). -** Rename LR0.cc -as lr0.cc, why upper case? - * Various ** Rewrite glr.cc in C++ As a matter of fact, it would be very interesting to see how much we can diff --git a/src/conflicts.c b/src/conflicts.c index f81d8318..c849e898 100644 --- a/src/conflicts.c +++ b/src/conflicts.c @@ -23,13 +23,13 @@ #include -#include "LR0.h" #include "complain.h" #include "conflicts.h" #include "files.h" #include "getargs.h" #include "gram.h" #include "lalr.h" +#include "lr0.h" #include "print-xml.h" #include "reader.h" #include "state.h" diff --git a/src/ielr.c b/src/ielr.c index 867b8a0a..a205a87d 100644 --- a/src/ielr.c +++ b/src/ielr.c @@ -540,7 +540,7 @@ typedef struct state_list /** * nextIsocore is the next state in a circularly linked-list of all states * with the same core. The one originally computed by generate_states in - * LR0.c is lr0Isocore. + * lr0.c is lr0Isocore. */ struct state_list *lr0Isocore; struct state_list *nextIsocore; diff --git a/src/lalr.c b/src/lalr.c index 0f1149d7..4255650c 100644 --- a/src/lalr.c +++ b/src/lalr.c @@ -28,12 +28,12 @@ #include #include -#include "LR0.h" #include "complain.h" #include "derives.h" #include "getargs.h" #include "gram.h" #include "lalr.h" +#include "lr0.h" #include "muscle-tab.h" #include "nullable.h" #include "reader.h" diff --git a/src/local.mk b/src/local.mk index b6161fbb..4b0a0ff5 100644 --- a/src/local.mk +++ b/src/local.mk @@ -30,8 +30,6 @@ src_bison_SOURCES = \ src/AnnotationList.h \ src/InadequacyList.c \ src/InadequacyList.h \ - src/LR0.c \ - src/LR0.h \ src/Sbitset.c \ src/Sbitset.h \ src/assoc.c \ @@ -61,6 +59,8 @@ src_bison_SOURCES = \ src/lalr.h \ src/location.c \ src/location.h \ + src/lr0.c \ + src/lr0.h \ src/main.c \ src/muscle-tab.c \ src/muscle-tab.h \ diff --git a/src/LR0.c b/src/lr0.c similarity index 99% rename from src/LR0.c rename to src/lr0.c index d977d364..f7f40d8e 100644 --- a/src/LR0.c +++ b/src/lr0.c @@ -27,12 +27,12 @@ #include -#include "LR0.h" #include "closure.h" #include "complain.h" #include "getargs.h" #include "gram.h" #include "lalr.h" +#include "lr0.h" #include "reader.h" #include "reduce.h" #include "state.h" diff --git a/src/LR0.h b/src/lr0.h similarity index 100% rename from src/LR0.h rename to src/lr0.h diff --git a/src/main.c b/src/main.c index 9ea92366..b56fae78 100644 --- a/src/main.c +++ b/src/main.c @@ -30,7 +30,6 @@ #include /* relocate2 */ #include -#include "LR0.h" #include "closeout.h" #include "complain.h" #include "conflicts.h" @@ -41,6 +40,7 @@ #include "gram.h" #include "ielr.h" #include "lalr.h" +#include "lr0.h" #include "muscle-tab.h" #include "nullable.h" #include "output.h" diff --git a/src/print-graph.c b/src/print-graph.c index 81280afc..302c7f72 100644 --- a/src/print-graph.c +++ b/src/print-graph.c @@ -21,7 +21,6 @@ #include #include "system.h" -#include "LR0.h" #include "closure.h" #include "complain.h" #include "conflicts.h" @@ -30,6 +29,7 @@ #include "gram.h" #include "graphviz.h" #include "lalr.h" +#include "lr0.h" #include "print-graph.h" #include "reader.h" #include "state.h" diff --git a/src/print-xml.c b/src/print-xml.c index b251e150..b3c46a33 100644 --- a/src/print-xml.c +++ b/src/print-xml.c @@ -25,15 +25,15 @@ #include -#include "LR0.h" #include "closure.h" #include "conflicts.h" #include "files.h" #include "getargs.h" #include "gram.h" #include "lalr.h" -#include "print.h" +#include "lr0.h" #include "print-xml.h" +#include "print.h" #include "reader.h" #include "reduce.h" #include "state.h" diff --git a/src/print.c b/src/print.c index 60bb2b36..365830ff 100644 --- a/src/print.c +++ b/src/print.c @@ -23,13 +23,13 @@ #include -#include "LR0.h" #include "closure.h" #include "conflicts.h" #include "files.h" #include "getargs.h" #include "gram.h" #include "lalr.h" +#include "lr0.h" #include "muscle-tab.h" #include "print.h" #include "reader.h"