FF4 - Snapshot

- Added more Context responsibilities.

src/rewrite/Context.cpp

@@ -36,7 +36,7 @@ Context::Context ()
 Context::Context (const Context& other)
 {
   throw std::string ("unimplemented Context::Context");
-//  config   = other.config;
+  config   = other.config;
   filter   = other.filter;
   keymap   = other.keymap;
   sequence = other.sequence;
@@ -50,7 +50,7 @@ Context& Context::operator= (const Context& other)
   throw std::string ("unimplemented Context::operator=");
   if (this != &other)
   {
-//    config   = other.config;
+    config   = other.config;
     filter   = other.filter;
     keymap   = other.keymap;
     sequence = other.sequence;
@@ -81,6 +81,7 @@ int Context::commandLine (int argc, char** argv)
 {
   throw std::string ("unimplemented Context::commandLine");
   // TODO Support rc: override.
+  // TODO Handle "--version, -v" right here.
   return 0;
 }
 

src/rewrite/Context.h

@@ -29,7 +29,7 @@
 
 #include "Filter.h"
 #include "Keymap.h"
-//#include "Config.h"
+#include "Config.h"
 #include "Sequence.h"
 #include "TDB.h"
 #include "T.h"
@@ -48,7 +48,7 @@ public:
   int run ();
 
 public:
-//  Config   config;
+  Config   config;
   Filter   filter;
   Keymap   keymap;
   Sequence sequence;

src/rewrite/Makefile

@@ -1,8 +1,9 @@
 PROJECT = 1.8
-CFLAGS  = -I. -I../../library/include -Wall -pedantic -ggdb3 -fno-rtti -fstack-check
+CFLAGS  = -I. -I.. -Wall -pedantic -ggdb3 -fno-rtti -fstack-check
 LFLAGS  = 
 LIBS    = 
-OBJECTS = main.o Context.o TDB.o T.o Sequence.o Filter.o Att.o Date.o Duration.o Keymap.o
+OBJECTS = main.o Context.o TDB.o T.o Sequence.o Filter.o Att.o Keymap.o \
+          ../util.o ../text.o ../Config.o ../Date.o
 
 all: $(PROJECT)