Commit graph

50 commits

Author SHA1 Message Date
Joey Hess
3bab5dfb1d revert parentDir change
Reverts 965e106f24

Unfortunately, this caused breakage on Windows, and possibly elsewhere,
because parentDir and takeDirectory do not behave the same when there is a
trailing directory separator.
2015-01-09 13:11:56 -04:00
Joey Hess
965e106f24 made parentDir return a Maybe FilePath; removed most uses of it
parentDir is less safe than takeDirectory, especially when working
with relative FilePaths. It's really only useful in loops that
want to terminate at /

This commit was sponsored by Audric SCHILTKNECHT.
2015-01-06 18:55:56 -04:00
Joey Hess
7b50b3c057 fix some mixed space+tab indentation
This fixes all instances of " \t" in the code base. Most common case
seems to be after a "where" line; probably vim copied the two space layout
of that line.

Done as a background task while listening to episode 2 of the Type Theory
podcast.
2014-10-09 15:09:11 -04:00
Joey Hess
b3a9d41910 fix build 2014-08-10 19:44:09 -04:00
Joey Hess
4dd6938850 make EvilSplicer re-box file-embed's ByteStrings
The armel autobuilder started failing:

Assistant/WebApp/Types.hs:128:14:
    primitive string literal must contain only characters <= '\xFF'

This fixes that.
2014-06-13 02:18:31 -04:00
Joey Hess
37da3d7b5d
better heuristic for what is a package-qualified symbol
Hopefully this will avoid mangling css files embedded in strings inside
spliced code.
2014-05-27 20:12:16 -04:00
Joey Hess
346112d49a
proper fix for "foo"# -- need MagicHash extension 2014-05-25 23:27:48 -04:00
Joey Hess
062e37d201
typo 2014-05-25 23:09:45 -04:00
Joey Hess
9b7fa4ad07 put in hack for weird new problem with ghc's emitted splices 2014-05-25 23:03:44 -04:00
Joey Hess
4e987d05a8 work around an EvilSplicer bug
This should fix the android build. The EvilSplicer cannot fix up ghc's
misformatting of a case expression with a construstor with a lot of
parameters, which spans multiple lines.
2014-05-10 12:27:21 -03:00
Joey Hess
6c3e11abaf avoid another encoding crash 2013-12-27 00:10:04 -04:00
Joey Hess
63fab93755 -Wall clean 2013-12-27 00:05:15 -04:00
Joey Hess
46f99c7764 avoid EvilSplicer crashing on encoding problems, including LANG=C with utf-8 in files 2013-12-19 02:37:21 -04:00
Joey Hess
0027cef395 improve EvilSplicer robustness 2013-12-18 21:39:09 +00:00
Joey Hess
8aa22a57ca use pure or return rather than (:[]) or \x -> [x] 2013-11-06 01:18:22 -04:00
Joey Hess
5ac0fcd12f oops 2013-09-22 21:47:24 -04:00
Joey Hess
746d3d5e1f one more EvilSplicer hack for the night 2013-09-22 20:34:20 -04:00
Joey Hess
9aa4ec6ee0 fix broken EvilSplicer change 2013-09-22 15:36:56 -04:00
Joey Hess
cc71315c50 improve lambdaparens hack 2013-09-22 11:41:26 -04:00
Joey Hess
8806fa9a8f another fine hack 2013-09-22 03:22:05 -04:00
Joey Hess
7e5af65110 add a hack to get build working with new library build 2013-05-08 12:52:48 -04:00
Joey Hess
e70a969ef1 EvilSplicer: fix handling of newlines in multiline strings 2013-05-02 22:56:06 -04:00
Joey Hess
79c0a6f807 argh!! http://hackage.haskell.org/package/zeroth 2013-04-18 20:10:31 -04:00
Joey Hess
715e68ad58 avoid adding parens to lambdas in tuples 2013-04-18 15:07:29 -04:00
Joey Hess
6ee4c2038e run lambda parenthesisation recursively inside the body of the lambda 2013-04-18 14:31:39 -04:00
Joey Hess
b86712ca80 fix lambda parenthesisation 2013-04-18 14:17:24 -04:00
Joey Hess
0d833239f1 fix build 2013-04-18 12:34:14 -04:00
Joey Hess
cc4d11eadd tighten search and replace slightly 2013-04-17 13:18:53 -04:00
Joey Hess
6f8ec9a1d2 argle 2013-04-17 11:57:46 -04:00
Joey Hess
7858f92e1a minor cleanup 2013-04-17 02:51:59 -04:00
Joey Hess
9fdca995de very close now.. but still so far 2013-04-17 00:51:29 -04:00
Joey Hess
e9738fd10d deal with GHC's broken layout of case expressions. ARGH why GHC WHY?!?! 2013-04-17 00:01:25 -04:00
Joey Hess
ab905a55fb Splicer contines his evil ways (and Joey goes slowly insane) 2013-04-16 22:28:42 -04:00
Joey Hess
35f2e01c23 Evil Splicer only *thought* he was evil until this commit happened.
So many nasty hacks!
2013-04-16 21:47:08 -04:00
Joey Hess
ce11c339e6 need to mangle another symbol 2013-04-16 19:58:39 -04:00
Joey Hess
a85c9ba561 a few nasty hacks for yesod 2013-04-16 15:10:23 -04:00
Joey Hess
737ece771b update 2013-04-15 17:42:39 -04:00
Joey Hess
f44c917b22 fix 2 splicing bugs 2013-04-15 14:50:05 -04:00
Joey Hess
859c0cdc86 handle multi-line QQ 2013-04-15 14:23:39 -04:00
Joey Hess
c172bf7092 only show files that are really changed 2013-04-15 12:11:27 -04:00
Joey Hess
aaad52881a hack around incorrect nested instance code generated by GHC
Yesod-specific hack for now.
2013-04-14 16:53:41 -04:00
Joey Hess
5fc8bef2e6 better handling of declaration splices
Still not quite enough to properly expand yesod type safe routes, but
getting there..
2013-04-14 16:44:05 -04:00
Joey Hess
2e94852994 fix inplace mode 2013-04-14 16:11:12 -04:00
Joey Hess
0c9bb2371e avoid updating a file if the old splice is the same as the new 2013-04-14 15:50:38 -04:00
Joey Hess
dd7e35ed97 incremental android builds with the EvilSplicer 2013-04-14 13:43:36 -04:00
Joey Hess
0b17d28988 better splice joining 2013-04-13 18:09:20 -04:00
Joey Hess
42ac215827 work around ghc weirdness 2013-04-13 17:53:59 -04:00
Joey Hess
eda0ba7397 fix a syntax problem with a splace that provides a parameter to a function 2013-04-13 17:22:15 -04:00
Joey Hess
504cce3ce3 added symbol de-mangling 2013-04-13 17:15:05 -04:00
Joey Hess
36d581f08d first version of the Evil Splicer! 2013-04-13 16:43:56 -04:00