From fdd43a961924835844c4fa886f3dd96b9c07c8d1 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 16 May 2009 22:22:56 -0400
Subject: [PATCH] FF4 - Snapshot

- Added more Context responsibilities.
---
 src/rewrite/Context.cpp | 5 +++--
 src/rewrite/Context.h   | 4 ++--
 src/rewrite/Makefile    | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/rewrite/Context.cpp b/src/rewrite/Context.cpp
index c68344681..0f8b14c95 100644
--- a/src/rewrite/Context.cpp
+++ b/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;
 }
 
diff --git a/src/rewrite/Context.h b/src/rewrite/Context.h
index 1be1b185f..26753a5eb 100644
--- a/src/rewrite/Context.h
+++ b/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;
diff --git a/src/rewrite/Makefile b/src/rewrite/Makefile
index 7115320db..f4021e3ba 100644
--- a/src/rewrite/Makefile
+++ b/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)