Adds libLexer and libParser

psde · Jan 17, 2013 · c320390 · c320390
1 parent 0fd9ef4
commit c320390
Show file tree

Hide file tree

Showing 23 changed files with 82 additions and 65 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+codepeiler
 *.sublime-workspace
 *.code
 bin/*
diff --git a/Makefile b/Makefile
@@ -1,20 +1,21 @@
 NAME = codepeiler
-LIBRARIES = Buffer
+LIBRARIES = Buffer Lexer Parser
 
 BINARIES = $(LIBARIES:%=lib%.a) $(NAME)
 BINPATHS = $(BINARIES:%=bin/%)
 SRCPATHS = $(LIBRARIES:%=src/lib%/) src/$(NAME)/
 
 all: release
 
-.PHONY: release
+.PHONY: release debug clean
 release:
  $(foreach project, $(SRCPATHS), $(MAKE) -C $(project) release;)
+ cp bin/$(NAME) .
 
-.PHONY: debug
 debug:
  $(foreach project, $(SRCPATHS), $(MAKE) -C $(project) release;)
+ cp bin/$(NAME) .
 
-.PHONY: clean
 clean:
- $(foreach project, $(SRCPATHS), $(MAKE) -C $(project) clean;)
+ $(foreach project, $(SRCPATHS), $(MAKE) -C $(project) clean;)
+ rm -f $(NAME)
diff --git a/src/binary.mk b/src/binary.mk
@@ -0,0 +1,24 @@
+# Generic makefile
+include ../common.mk
+ROOT = ../..
+OUTDIR = $(ROOT)/$(BINDIR)
+OUTNAME= $(OUTDIR)/$(NAME)
+SRCS = $(wildcard *.cpp)
+OBJS = $(SRCS:.cpp=.o)
+DEPS = $(OBJS:.o=.d)
+
+release:
+ $(MAKE) CXXFLAGS="$(RELEASEFLAGS)" $(OUTNAME)
+
+debug:
+ $(MAKE) CXXFLAGS="$(DEBUGFLAGS)" $(OUTNAME)
+
+%.o: %.cpp
+ $(CXX) $(CXXFLAGS) -c -o $@ $<
+
+$(OUTNAME): $(OBJS)
+ $(CXX) $(CXXFLAGS) -o $@ $(OBJS) $(LIBS)
+
+.PHONY: clean
+clean:
+ $(RM) $(OUTNAME) $(OBJS) $(DEPS)
diff --git a/src/codepeiler/Makefile b/src/codepeiler/Makefile
@@ -1,28 +1,6 @@
 # Project config
 NAME = codepeiler
-LIBS = -lBuffer
+LIBS = -lBuffer -lLexer -lParser
 
-# Generic makefile
-include ../common.mk
-ROOT = ../..
-OUTDIR = $(ROOT)/$(BINDIR)
-OUTNAME= $(OUTDIR)/$(NAME)
-SRCS = $(wildcard *.cpp)
-OBJS = $(SRCS:.cpp=.o)
-DEPS = $(OBJS:.o=.d)
-
-release:
- $(MAKE) CXXFLAGS="$(RELEASEFLAGS)" $(OUTNAME)
-
-debug:
- $(MAKE) CXXFLAGS="$(DEBUGFLAGS)" $(OUTNAME)
-
-%.o: %.cpp
- $(CXX) $(CXXFLAGS) -c -o $@ $<
-
-$(OUTNAME): $(OBJS)
- $(CXX) $(CXXFLAGS) -o $@ $(OBJS) $(LIBS)
-
-.PHONY: clean
-clean:
- $(RM) $(OUTNAME) $(OBJS) $(DEPS)
+# Include binary.mk
+include ../binary.mk
diff --git a/src/codepeiler/main.cpp b/src/codepeiler/main.cpp
@@ -12,11 +12,10 @@
 #include <libStd/String.hpp>
 #include <libBuffer/BufferReader.hpp>
 #include <libBuffer/BufferWriter.hpp>
-
-#include "Token.hpp"
-#include "Lexer.hpp"
-#include "Symtable.hpp"
-#include "Parser.hpp"
+#include <libLexer/Token.hpp>
+#include <libLexer/Lexer.hpp>
+#include <libLexer/Symtable.hpp>
+#include <libParser/Parser.hpp>
 
 int main(int argc, char *argv[])
 {

diff --git a/src/libBuffer/Makefile b/src/libBuffer/Makefile
@@ -2,27 +2,5 @@
 NAME = Buffer
 LIBS = 
 
-# Generic library makefile
-include ../common.mk
-ROOT = ../..
-OUTDIR = $(ROOT)/$(BINDIR)
-OUTNAME = $(OUTDIR)/lib$(NAME).a
-SRCS = $(wildcard *.cpp)
-OBJS = $(SRCS:.cpp=.o)
-DEPS = $(OBJS:.o=.d)
-
-release:
- $(MAKE) CXXFLAGS="$(RELEASEFLAGS)" $(OUTNAME)
-
-debug:
- $(MAKE) CXXFLAGS="$(DEBUGFLAGS)" $(OUTNAME)
-
-%.o: %.cpp
- $(CXX) $(CXXFLAGS) -c -o $@ $<
-
-$(OUTNAME): $(OBJS)
- ar rs $@ $(OBJS)
-
-.PHONY: clean
-clean:
- $(RM) $(OUTNAME) $(OBJS) $(DEPS)
+# Include library.mk
+include ../library.mk
diff --git a/src/codepeiler/Lexer.cpp → src/libLexer/Lexer.cpp b/src/codepeiler/Lexer.cpp → src/libLexer/Lexer.cpp
diff --git a/src/codepeiler/Lexer.hpp → src/libLexer/Lexer.hpp b/src/codepeiler/Lexer.hpp → src/libLexer/Lexer.hpp
diff --git a/src/libLexer/Makefile b/src/libLexer/Makefile
@@ -0,0 +1,6 @@
+# Project config
+NAME = Lexer
+LIBS = 
+
+# Include library.mk
+include ../library.mk
diff --git a/src/codepeiler/Symtable.hpp → src/libLexer/Symtable.hpp b/src/codepeiler/Symtable.hpp → src/libLexer/Symtable.hpp
diff --git a/src/codepeiler/Token.cpp → src/libLexer/Token.cpp b/src/codepeiler/Token.cpp → src/libLexer/Token.cpp
diff --git a/src/codepeiler/Token.hpp → src/libLexer/Token.hpp b/src/codepeiler/Token.hpp → src/libLexer/Token.hpp
diff --git a/src/libParser/Makefile b/src/libParser/Makefile
@@ -0,0 +1,6 @@
+# Project config
+NAME = Parser
+LIBS = -lLexer
+
+# Include library.mk
+include ../library.mk
diff --git a/src/codepeiler/ParseTree.cpp → src/libParser/ParseTree.cpp b/src/codepeiler/ParseTree.cpp → src/libParser/ParseTree.cpp
diff --git a/src/codepeiler/ParseTree.hpp → src/libParser/ParseTree.hpp b/src/codepeiler/ParseTree.hpp → src/libParser/ParseTree.hpp
@@ -2,9 +2,9 @@
 
 #include <libStd/String.hpp>
 #include <libStd/Vector.hpp>
+#include <libLexer/Token.hpp>
 
 #include "ParserRule.hpp"
-#include "Token.hpp"
 
 class ParseTree
 {

diff --git a/src/codepeiler/ParseTreeDump.cpp → src/libParser/ParseTreeDump.cpp b/src/codepeiler/ParseTreeDump.cpp → src/libParser/ParseTreeDump.cpp
diff --git a/src/codepeiler/ParseTreeMakeCode.cpp → src/libParser/ParseTreeMakeCode.cpp b/src/codepeiler/ParseTreeMakeCode.cpp → src/libParser/ParseTreeMakeCode.cpp
diff --git a/src/codepeiler/ParseTreeTypeCheck.cpp → src/libParser/ParseTreeTypeCheck.cpp b/src/codepeiler/ParseTreeTypeCheck.cpp → src/libParser/ParseTreeTypeCheck.cpp
diff --git a/src/codepeiler/Parser.cpp → src/libParser/Parser.cpp b/src/codepeiler/Parser.cpp → src/libParser/Parser.cpp
@@ -3,7 +3,6 @@
 #endif
 
 #include "Parser.hpp"
-#include <iostream>
 
 Parser::Parser(Lexer *lexer)
  : lexer(lexer)

diff --git a/src/codepeiler/Parser.hpp → src/libParser/Parser.hpp b/src/codepeiler/Parser.hpp → src/libParser/Parser.hpp
@@ -1,15 +1,16 @@
 #pragma once
 
 #include <exception>
+#include <iostream>
 
 #include <libStd/String.hpp>
 #include <libStd/List.hpp>
+#include <libLexer/Token.hpp>
+#include <libLexer/Lexer.hpp>
+#include <libLexer/Token.hpp>
 
 #include "ParserRule.hpp"
-#include "Token.hpp"
-#include "Lexer.hpp"
 #include "ParseTree.hpp"
-#include "Token.hpp"
 
 class ParserError : public std::exception
 {

diff --git a/src/codepeiler/ParserRule.cpp → src/libParser/ParserRule.cpp b/src/codepeiler/ParserRule.cpp → src/libParser/ParserRule.cpp
diff --git a/src/codepeiler/ParserRule.hpp → src/libParser/ParserRule.hpp b/src/codepeiler/ParserRule.hpp → src/libParser/ParserRule.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <libStd/String.hpp>
-#include "Token.hpp"
+#include <libLexer/Token.hpp>
 
 struct ParserRule {
  String name;

diff --git a/src/library.mk b/src/library.mk
@@ -0,0 +1,24 @@
+# Generic library makefile
+include ../common.mk
+ROOT = ../..
+OUTDIR = $(ROOT)/$(BINDIR)
+OUTNAME = $(OUTDIR)/lib$(NAME).a
+SRCS = $(wildcard *.cpp)
+OBJS = $(SRCS:.cpp=.o)
+DEPS = $(OBJS:.o=.d)
+
+release:
+ $(MAKE) CXXFLAGS="$(RELEASEFLAGS)" $(OUTNAME)
+
+debug:
+ $(MAKE) CXXFLAGS="$(DEBUGFLAGS)" $(OUTNAME)
+
+%.o: %.cpp
+ $(CXX) $(CXXFLAGS) -c -o $@ $<
+
+$(OUTNAME): $(OBJS)
+ ar rs $@ $(OBJS)
+
+.PHONY: clean
+clean:
+ $(RM) $(OUTNAME) $(OBJS) $(DEPS)