Permalink
Browse files

merge conflict

  • Loading branch information...
2 parents 5d645a7 + 07cb524 commit 6eda8fdb1846acafd4ac37832e71adbc76e335d8 @liweinan committed with Mar 16, 2013
View
@@ -0,0 +1,3 @@
+.PHONY: a
+a:
+ ${MAKE} --directory=$@
View
@@ -0,0 +1,3 @@
+.PHONY: out
+out:
+ touch out
View
@@ -7,4 +7,11 @@ dummy:
@echo $(COMPILE.C)
@echo $(CXX)
@echo $(CXXFLAGS)
- @echo $(TARGET_ARCH)
+ @echo $(TARGET_ARCH)
+
+default: pre pre2 pre2
+ @echo $+
+ @echo $<
+ @echo $^
+ @echo $@
+ @echo $?
View
No changes.
View
No changes.
View
@@ -0,0 +1,9 @@
+vpath %.c src
+vpath %.h include
+
+main: hello.c main.c hello.h
+ gcc -I include $^ -o $@
+
+.PHONY: clean
+clean:
+ rm -rf main
@@ -0,0 +1,5 @@
+#ifndef _HELLO_H_
+#define _HELLO_H_
+
+extern void say_hello();
+#endif
View
@@ -0,0 +1,5 @@
+#include <stdio.h>
+
+say_hello() {
+ printf("Hello, world!");
+}
View
@@ -0,0 +1,6 @@
+#include <hello.h>
+
+int main() {
+ say_hello();
+ return 0;
+}
View
@@ -0,0 +1,13 @@
+def append_to_self(x)
+ unless x.respond_to? :<<
+ raise ArgumentError, "Method not supported"
+ end
+ if x.is_a? Numeric
+ raise ArgumentError, "Numeric not supported"
+ end
+ x << x
+end
+
+puts append_to_self('abc')
+puts append_to_self([1,2,3])
+
@@ -0,0 +1,7 @@
+RSPEC_OPT='-fd'
+
+.PHONY: test
+test: bowling.rb bowling_spec.rb
+ @$(rb19)
+ @rspec bowling_spec.rb $(RSPEC_OPT)
+
@@ -0,0 +1,8 @@
+class Bowling
+ def hit(pins)
+ end
+
+ def score
+ 0
+ end
+end
@@ -0,0 +1,11 @@
+require './bowling.rb'
+
+describe Bowling, "#score" do
+ it "returns 0 for all gutter game" do
+ bowling = Bowling.new
+ 20.times { bowling.hit(0) }
+ bowling.score.should eq(0)
+ end
+end
+
+

0 comments on commit 6eda8fd

Please sign in to comment.