git.iko.soy/typeable/aeson
on master help sign in
Merge from default

--HG-- branch : hashmap

commit822d69b9e8914c1a7444d4f5a751800e792e571b authorBryan O'Sullivan <bos@serpentine.com> dateTue 1 Feb 2011, 12:58 (16 years ago) parent1156fcb52e33b0
3 files changed+23−13
compare with master
unifiedsplit
.hgignore+2−13 benchmarks/Makefile+21 benchmarks/json-data.tar.bz2
.hgignore+2−13
@@ -1,19 +1,8 @@
11^dist$
2−benchmarks/Arse
3−benchmarks/med.txt
4−benchmarks/tiny
2+^benchmarks/(?:AesonParse|EncodeFile|JsonParse|json-data)$
3+.*\.(?:h[ip]|o|orig|out|pdf|prof|ps|rej)$
54
65syntax: glob
7−*.aux
8−*.hi
9−*.hp
10−*.o
11−*.orig
12−*.out
13−*.pdf
14−*.prof
15−*.ps
16−*.rej
176*~
187.*.swp
198.\#*
benchmarks/Makefilenew file+21
@@ -0,0 +1,21 @@
1+ghc := ghc
2+ghcflags := -O
3+
4+binaries := AesonParse EncodeFile JsonParse
5+
6+all: json-data/example.json $(binaries)
7+
8+AesonParse: AesonParse.hs
9+ $(ghc) $(ghcflags) --make -o $@ $^
10+
11+EncodeFile: EncodeFile.hs
12+ $(ghc) $(ghcflags) --make -o $@ $^
13+
14+JsonParse: JsonParse.hs
15+ $(ghc) $(ghcflags) --make -o $@ $^
16+
17+json-data/example.json: json-data.tar.bz2
18+ bzip2 -dc < $^ | tar -m -xf -
19+
20+clean:
21+ -rm -f *.o *.hi $(binaries)
benchmarks/json-data.tar.bz2new file

Binary file not shown.