dd0ea1e · typeable/hexml

gen/Main.hs−2

compare with master

unifiedsplit

@@ -65,6 +65,4 @@ rerender o = f

65 f ((s,NameStart):(e,NameEnd):(_,TagClose):xs) = "/" ++ sub s e ++ ">" ++ f xs

66 f ((s,NameStart):(e,NameEnd):xs) = sub s e ++ " " ++ f xs

67 f ((s,QuoteStart):(e,QuoteEnd):xs) = "=\"" ++ sub s e ++ "\" " ++ f xs

68− f ((_,AttribsStart):xs) = f xs

69− f ((_,AttribsEnd):xs) = f xs

70 f [] = []

68 f [] = []

gen/Parser.hs−3

@@ -6,7 +6,6 @@ import Lib

6data Out

7 = NameStart | NameEnd

8 | QuoteStart | QuoteEnd

9− | AttribsStart | AttribsEnd

10 | Tag

9 | Tag

11 | TagComment | TagOpen | TagClose | TagOpenClose

10 | TagComment | TagOpen | TagClose | TagOpenClose

12 deriving Show

11 deriving Show

@@ -42,9 +41,7 @@ attrib = do

42 ,abort "Invalid attribute, expected quote (either ' or \")"]

41 ,abort "Invalid attribute, expected quote (either ' or \")"]

43

42

44attribs = do

43attribs = do

45− out AttribsStart

46 many attrib

44 many attrib

47− out AttribsEnd

48

45

49tag = do

46tag = do

50 out Tag

47 out Tag

gen/test.c−2

@@ -262,8 +262,6 @@ static inline str gap(const char* ref, const char* start, const char* end)

262 d->attrs.attrs[d->attrs.used].name = gap(d->body, name_start, name_end); \

263 d->attrs.attrs[d->attrs.used].value = gap(d->body, quote_start, quote_end); \

264 d->attrs.used++;

265−#define P_AttribsStart printf("AttribsStart %s\n", p)

266−#define P_AttribsEnd printf("AttribsEnd %s\n", p)

267#define P_Tag tag_start = p

265#define P_Tag tag_start = p

268#define P_TagComment printf("TagComment %s\n", p)

266#define P_TagComment printf("TagComment %s\n", p)

269#define P_TagOpen printf("TagOpen %s\n", p)

267#define P_TagOpen printf("TagOpen %s\n", p)