Commit d1b65c6f46ab0891db3c80db2eedbb434168aabe | zig

author	Andrew Kelley <andrew@ziglang.org> 2016-04-24 16:33:32-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2016-04-24 16:36:05-07:00
log	d1b65c6f46ab0891db3c80db2eedbb434168aabe
tree	7dd56a4baa0bd1436e20fb1ead20959e3b4fa963
parent	3886fdc19b624e6fa47dcd02b627548bc7a7ada0

2 files changed, 27 insertions(+), 0 deletions(-)

src/tokenizer.cpp+21

...	...	@@ -136,6 +136,8 @@ enum TokenizeState {
136	136	TokenizeStateRawStringContents,
137	137	TokenizeStateRawStringMaybeEnd,
138	138	TokenizeStateCharLiteral,
	139	TokenizeStateCharLiteralEscape,
	140	TokenizeStateCharLiteralEnd,
139	141	TokenizeStateSawStar,
140	142	TokenizeStateSawSlash,
141	143	TokenizeStateSawPercent,
...	...	@@ -955,10 +957,27 @@ void tokenize(Buf buf, Tokenization out) {
955	957	end_token(&t);
956	958	t.state = TokenizeStateStart;
957	959	break;
	960	case '\\':
	961	t.state = TokenizeStateCharLiteralEscape;
	962	break;
958	963	default:
	964	t.state = TokenizeStateCharLiteralEnd;
959	965	break;
960	966	}
961	967	break;
	968	case TokenizeStateCharLiteralEscape:
	969	t.state = TokenizeStateCharLiteralEnd;
	970	break;
	971	case TokenizeStateCharLiteralEnd:
	972	switch (c) {
	973	case '\'':
	974	end_token(&t);
	975	t.state = TokenizeStateStart;
	976	break;
	977	default:
	978	tokenize_error(&t, "invalid character: '%c'", c);
	979	}
	980	break;
962	981	case TokenizeStateZero:
963	982	switch (c) {
964	983	case 'b':
...	...	@@ -1118,6 +1137,8 @@ void tokenize(Buf buf, Tokenization out) {
1118	1137	tokenize_error(&t, "unterminated raw string");
1119	1138	break;
1120	1139	case TokenizeStateCharLiteral:
	1140	case TokenizeStateCharLiteralEscape:
	1141	case TokenizeStateCharLiteralEnd:
1121	1142	tokenize_error(&t, "unterminated character literal");
1122	1143	break;
1123	1144	case TokenizeStateSymbol:

test/self_hosted.zig+6