src/ml_bytecode.c

@@ -1836,8 +1836,8 @@ void ml_closure_info_list(ml_stringbuffer_t *Buffer, ml_closure_info_t *Info) {
 			Inst = Inst[1].Inst;
 		} else {
 			Inst += ml_closure_inst_list(Inst, Buffer);
+			ml_stringbuffer_put(Buffer, '\n');
 		}
-		ml_stringbuffer_put(Buffer, '\n');
 	}
 }
 

src/ml_compiler.c

@@ -901,6 +901,9 @@ void ml_suspend_expr_compile(mlc_function_t *Function, mlc_parent_expr_t *Expr,
 	Frame->Expr = Expr;
 	Frame->Flags = Flags;
 	mlc_expr_t *Child = Expr->Child;
+	if (!Child) {
+		MLC_EXPR_ERROR(Expr, ml_error("CompilerError", "Empty susp expression"));
+	}
 	if (Child->Next) {
 		Frame->Child = Child->Next;
 		return mlc_compile(Function, Child, MLCF_PUSH);
@@ -2310,17 +2313,17 @@ void ml_const_call_expr_compile(mlc_function_t *Function, mlc_parent_value_expr_
 
 typedef struct {
 	mlc_expr_t *Guard;
+	ml_call_expr_frame_t *Caller;
 	int OldIt;
 } ml_guard_expr_frame_t;
 
 static void ml_guard_expr_compile3(mlc_function_t *Function, ml_value_t *Value, ml_guard_expr_frame_t *Frame) {
 	Function->It = Frame->OldIt;
 	MLC_POP();
-	ml_call_expr_frame_t *Caller = (ml_call_expr_frame_t *)&Function->Frame->Data;
 	ml_inst_t *CheckInst = MLC_EMIT(Frame->Guard->EndLine, MLI_AND_POP, 2);
-	CheckInst[2].Count = Caller->Index + 1;
-	CheckInst[1].Inst = Caller->NilInst;
-	Caller->NilInst = CheckInst + 1;
+	CheckInst[2].Count = Frame->Caller->Index + 1;
+	CheckInst[1].Inst = Frame->Caller->NilInst;
+	Frame->Caller->NilInst = CheckInst + 1;
 	MLC_RETURN(NULL);
 }
 
@@ -2332,17 +2335,15 @@ static void ml_guard_expr_compile2(mlc_function_t *Function, ml_value_t *Value,
 }
 
 void ml_guard_expr_compile(mlc_function_t *Function, mlc_parent_expr_t *Expr, int Flags) {
-	if (Function->Frame->run == (mlc_frame_fn)ml_call_expr_compile4) {
-		MLC_FRAME(ml_guard_expr_frame_t, ml_guard_expr_compile2);
-		Frame->Guard = Expr->Child->Next;
-		return mlc_compile(Function, Expr->Child, MLCF_PUSH);
-	} else if (Function->Frame->run == (mlc_frame_fn)ml_call_expr_compile5) {
-		MLC_FRAME(ml_guard_expr_frame_t, ml_guard_expr_compile2);
-		Frame->Guard = Expr->Child->Next;
-		return mlc_compile(Function, Expr->Child, MLCF_PUSH);
-	} else {
+	if ((Function->Frame->run != (mlc_frame_fn)ml_call_expr_compile4) &&
+		(Function->Frame->run != (mlc_frame_fn)ml_call_expr_compile5)) {
 		MLC_EXPR_ERROR(Expr, ml_error("CompilerError", "Guard expression used outside of function call"));
 	}
+	ml_call_expr_frame_t *Caller = (ml_call_expr_frame_t *)Function->Frame->Data;
+	MLC_FRAME(ml_guard_expr_frame_t, ml_guard_expr_compile2);
+	Frame->Guard = Expr->Child->Next;
+	Frame->Caller = Caller;
+	return mlc_compile(Function, Expr->Child, MLCF_PUSH);
 }
 
 static void ml_tuple_expr_compile2(mlc_function_t *Function, ml_value_t *Value, mlc_parent_expr_frame_t *Frame) {
@@ -2373,6 +2374,7 @@ void ml_tuple_expr_compile(mlc_function_t *Function, mlc_parent_expr_t *Expr, in
 			int Count = 0;
 			for (mlc_expr_t *Child = Expr->Child; Child; Child = Child->Next) ++Count;
 			Frame->Count = Count;
+			Frame->NilInst = NULL;
 			Frame->Flags = Flags;
 			ml_inst_t *LoadInst = MLC_EMIT(Expr->StartLine, MLI_LOAD, 1);
 			LoadInst[1].Value = (ml_value_t *)MLTupleT;
@@ -2442,6 +2444,7 @@ void ml_list_expr_compile(mlc_function_t *Function, mlc_parent_expr_t *Expr, int
 			int Count = 0;
 			for (mlc_expr_t *Child = Expr->Child; Child; Child = Child->Next) ++Count;
 			Frame->Count = Count;
+			Frame->NilInst = NULL;
 			Frame->Flags = Flags;
 			ml_inst_t *LoadInst = MLC_EMIT(Expr->StartLine, MLI_LOAD, 1);
 			LoadInst[1].Value = (ml_value_t *)MLListOfArgs;
@@ -2507,6 +2510,7 @@ void ml_map_expr_compile(mlc_function_t *Function, mlc_parent_expr_t *Expr, int
 			int Count = 0;
 			for (mlc_expr_t *Child = Expr->Child; Child; Child = Child->Next) ++Count;
 			Frame->Count = Count;
+			Frame->NilInst = NULL;
 			Frame->Flags = Flags;
 			ml_inst_t *LoadInst = MLC_EMIT(Expr->StartLine, MLI_LOAD, 1);
 			LoadInst[1].Value = (ml_value_t *)MLMapOfArgs;
@@ -3953,19 +3957,9 @@ void ml_parser_special(ml_parser_t *Parser, ml_value_t *(*Special)(void *), void
 	Parser->SpecialData = Data;
 }
 
-typedef enum {
-	EXPR_SIMPLE,
-	EXPR_AND,
-	EXPR_OR,
-	EXPR_FOR,
-	EXPR_DEFAULT
-} ml_expr_level_t;
-
 static int ml_parse(ml_parser_t *Parser, ml_token_t Token);
-static void ml_accept(ml_parser_t *Parser, ml_token_t Token);
 static mlc_expr_t *ml_parse_expression(ml_parser_t *Parser, ml_expr_level_t Level);
 static mlc_expr_t *ml_accept_term(ml_parser_t *Parser, int MethDecl);
-static mlc_expr_t *ml_accept_expression(ml_parser_t *Parser, ml_expr_level_t Level);
 static void ml_accept_arguments(ml_parser_t *Parser, ml_token_t EndToken, mlc_expr_t **ArgsSlot);
 
 static inline uint8_t ml_nibble(ml_parser_t *Parser, char C) {
@@ -4388,28 +4382,10 @@ static ml_token_t ml_scan(ml_parser_t *Parser) {
 				return Parser->Token;
 			}
 			const char *Ident = ml_ident(Next, Length);
-			//char *Ident = snew(Length + 1);
-			//memcpy(Ident, Next, Length);
-			//Ident[Length] = 0;
-			if (End[0] == '\"') {
+			if (End[0] == '\"' || End[0] == '\'') {
 				Parser->Ident = Ident;
 				Parser->Token = MLT_ESCAPE;
-				Parser->Next = End + 1;
-				/*string_fn_t StringFn = stringmap_search(StringFns, Ident);
-				if (!StringFn) {
-					ml_parse_warn(Parser, "ParseError", "Unknown string prefix: %s", Ident);
-					StringFn = ml_string;
-				}
-				Parser->Next = End + 1;
-				int Length = ml_scan_raw_string(Parser);
-				ml_value_t *Value = StringFn(Parser->Ident, Length);
-				if (ml_is_error(Value)) {
-					ml_error_trace_add(Value, Parser->Source);
-					Parser->Value = Value;
-					longjmp(Parser->OnError, 1);
-				}
-				Parser->Value = Value;
-				Parser->Token = MLT_VALUE;*/
+				Parser->Next = End;
 				return Parser->Token;
 			}
 			Parser->Next = End;
@@ -4642,7 +4618,7 @@ static inline int ml_parse2(ml_parser_t *Parser, ml_token_t Token) {
 	}
 }
 
-static void ml_accept(ml_parser_t *Parser, ml_token_t Token) {
+void ml_accept(ml_parser_t *Parser, ml_token_t Token) {
 	if (ml_parse2(Parser, Token)) return;
 	if (Parser->Token == MLT_IDENT) {
 		ml_parse_warn(Parser, "ParseError", "Expected %s not %s (%s)", MLTokens[Token], MLTokens[Parser->Token], Parser->Ident);
@@ -5516,7 +5492,7 @@ static mlc_expr_t *ml_parse_factor(ml_parser_t *Parser, int MethDecl) {
 	case MLT_SUSP: {
 		ml_next(Parser);
 		ML_EXPR(SuspendExpr, parent, suspend);
-		SuspendExpr->Child = ml_parse_expression(Parser, EXPR_DEFAULT);
+		SuspendExpr->Child = ml_accept_expression(Parser, EXPR_DEFAULT);
 		if (ml_parse(Parser, MLT_COMMA)) {
 			SuspendExpr->Child->Next = ml_accept_expression(Parser, EXPR_DEFAULT);
 		}
@@ -5903,7 +5879,7 @@ static mlc_expr_t *ml_parse_expression(ml_parser_t *Parser, ml_expr_level_t Leve
 	return Expr;
 }
 
-static mlc_expr_t *ml_accept_expression(ml_parser_t *Parser, ml_expr_level_t Level) {
+mlc_expr_t *ml_accept_expression(ml_parser_t *Parser, ml_expr_level_t Level) {
 	ml_skip_eol(Parser);
 	mlc_expr_t *Expr = ml_parse_expression(Parser, Level);
 	if (!Expr) {

src/ml_compiler2.h

@@ -71,6 +71,17 @@ typedef enum {
 	MLT_METHOD
 } ml_token_t;
 
+typedef enum {
+	EXPR_SIMPLE,
+	EXPR_AND,
+	EXPR_OR,
+	EXPR_FOR,
+	EXPR_DEFAULT
+} ml_expr_level_t;
+
+void ml_accept(ml_parser_t *Parser, ml_token_t Token);
+mlc_expr_t *ml_accept_expression(ml_parser_t *Parser, ml_expr_level_t Level);
+
 typedef struct mlc_function_t mlc_function_t;
 typedef struct mlc_frame_t mlc_frame_t;
 typedef struct mlc_loop_t mlc_loop_t;

src/ml_string.c

@@ -3848,8 +3848,10 @@ ml_value_t *ml_regexi(const char *Pattern0, int Length) {
 }
 
 static ml_value_t *ml_parser_escape_regex(ml_parser_t *Parser) {
-	const char *Next = ml_parser_clear(Parser), *End = Next;
-	while (End[0] != '\"') {
+	const char *Next = ml_parser_clear(Parser);
+	char Quote = *Next++;
+	const char *End = Next;
+	while (End[0] != Quote) {
 		if (!End[0]) {
 			ml_parse_warn(Parser, "ParseError", "End of input while parsing string");
 			break;
@@ -3874,8 +3876,10 @@ static ml_value_t *ml_parser_escape_regex(ml_parser_t *Parser) {
 }
 
 static ml_value_t *ml_parser_escape_regexi(ml_parser_t *Parser) {
-	const char *Next = ml_parser_clear(Parser), *End = Next;
-	while (End[0] != '\"') {
+	const char *Next = ml_parser_clear(Parser);
+	char Quote = *Next++;
+	const char *End = Next;
+	while (End[0] != Quote) {
 		if (!End[0]) {
 			ml_parse_warn(Parser, "ParseError", "End of input while parsing string");
 			break;

src/ml_time.c

@@ -104,8 +104,10 @@ ml_value_t *ml_time_parse(const char *Value, int Length) {
 }
 
 ml_value_t *ml_parser_escape_time(ml_parser_t *Parser) {
-	const char *Next = ml_parser_clear(Parser), *End = Next;
-	while (End[0] != '\"') {
+	const char *Next = ml_parser_clear(Parser);
+	char Quote = *Next++;
+	const char *End = Next;
+	while (End[0] != Quote) {
 		if (!End[0]) {
 			ml_parse_warn(Parser, "ParseError", "End of input while parsing string");
 			break;
@@ -626,8 +628,10 @@ static ml_value_t *ml_time_zone_parse(const char *Id, int Length) {
 }
 
 ml_value_t *ml_parser_escape_time_zone(ml_parser_t *Parser) {
-	const char *Next = ml_parser_clear(Parser), *End = Next;
-	while (End[0] != '\"') {
+	const char *Next = ml_parser_clear(Parser);
+	char Quote = *Next++;
+	const char *End = Next;
+	while (End[0] != Quote) {
 		if (!End[0]) {
 			ml_parse_warn(Parser, "ParseError", "End of input while parsing string");
 			break;

src/ml_uuid.c

@@ -35,8 +35,10 @@ ml_value_t *ml_uuid_parse(const char *Value, int Length) {
 }
 
 ml_value_t *ml_parser_escape_uuid(ml_parser_t *Parser) {
-	const char *Next = ml_parser_clear(Parser), *End = Next;
-	while (End[0] != '\"') {
+	const char *Next = ml_parser_clear(Parser);
+	char Quote = *Next++;
+	const char *End = Next;
+	while (End[0] != Quote) {
 		if (!End[0]) {
 			ml_parse_warn(Parser, "ParseError", "End of input while parsing string");
 			break;