Permalink
Browse files

okk has been renamed to bonsai

  • Loading branch information...
bakineggs committed May 27, 2012
1 parent 040af20 commit 77871a1d5d92b0137461eb06aa5a2b39c19ea1e7
Showing with 11 additions and 11 deletions.
  1. +3 −3 .gitmodules
  2. +2 −2 Makefile
  3. +2 −2 README
  4. +1 −0 bonsai
  5. +1 −1 lexer.l
  6. +0 −1 okk
  7. +1 −1 parser.y
  8. +1 −1 rules.okk → rules.bonsai
View
@@ -1,3 +1,3 @@
-[submodule "okk"]
- path = okk
- url = git://github.com/bakineggs/okk.git
+[submodule "bonsai"]
+ path = bonsai
+ url = git://github.com/bakineggs/bonsai.git
View
@@ -1,10 +1,10 @@
interpreter: interpreter.c parser.o lexer.o
gcc -o $@ $^
-interpreter.c: rules.okk .git/index
+interpreter.c: rules.bonsai .git/index
git submodule init
git submodule update
- cd okk; ruby compile.rb ../rules.okk > ../interpreter.c.tmp
+ cd bonsai; ruby compile.rb ../rules.bonsai > ../interpreter.c.tmp
mv interpreter.c.tmp interpreter.c
parser.o: parser.c
View
4 README
@@ -1,4 +1,4 @@
-An implementation of the Challenge Language in Okk
+An implementation of the Challenge Language in Bonsai
-Okk: http://github.com/bakineggs/okk
+Bonsai: http://github.com/bakineggs/bonsai
Challenge: http://fsl.cs.uiuc.edu/images/0/0c/CS422-Spring-2010-CHALLENGE.pdf
1 bonsai
Submodule bonsai added at 68925c
View
@@ -1,5 +1,5 @@
%{
- #include "okk/node_builder.h"
+ #include "bonsai/node_builder.h"
#include "parser.h"
extern int yywrap(void) { }
1 okk
Submodule okk deleted from 60237d
View
@@ -1,6 +1,6 @@
%{
#include <stdio.h>
- #include "okk/node_builder.h"
+ #include "bonsai/node_builder.h"
extern int yylex();
void yyerror(const char* error) { fprintf(stderr, "%s\n", error); }
@@ -7,7 +7,7 @@
# Access our parser
%{
- #include "okk/types.h"
+ #include "bonsai/types.h"
extern int yyparse();
extern Node* computation;

0 comments on commit 77871a1

Please sign in to comment.