Mark/esolang
1
0
Fork 0
Code Issues Packages Activity

Fix Chef parser throwing at section end

Browse Source
This commit is contained in:
Nilay Majorwar 2023-05-28 19:47:56 +05:30
parent 3c500739bb
commit 78996f849d
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
languages/chef/parser/index.ts
View File

@ -94,7 +94,7 @@ const parseEmptyLine = (
/** Parse the stack for method instructions section */ /** Parse the stack for method instructions section */
const parseRecipeComments = (stack: CodeStack): void => { const parseRecipeComments = (stack: CodeStack): void => {
while (stack[stack.length - 1].line.trim() !== "") stack.pop(); while (stack[stack.length - 1]?.line.trim() !== "") stack.pop();
}; };
/** Parse the stack for the header of ingredients section */ /** Parse the stack for the header of ingredients section */
@ -266,6 +266,7 @@ const parseRecipe = (
parseEmptyLine(stack, lastCharRange); parseEmptyLine(stack, lastCharRange);
// Check if exists and parse recipe comments // Check if exists and parse recipe comments
assertCodeStackNotEmpty(stack, lastCharRange);
if (stack[stack.length - 1].line.trim() !== "Ingredients.") { if (stack[stack.length - 1].line.trim() !== "Ingredients.") {
parseRecipeComments(stack); parseRecipeComments(stack);
parseEmptyLine(stack, lastCharRange); parseEmptyLine(stack, lastCharRange);
@ -277,12 +278,14 @@ const parseRecipe = (
parseEmptyLine(stack, lastCharRange); parseEmptyLine(stack, lastCharRange);
// Check if exists and parse cooking time // Check if exists and parse cooking time
assertCodeStackNotEmpty(stack, lastCharRange);
if (stack[stack.length - 1].line.trim().startsWith("Cooking time: ")) { if (stack[stack.length - 1].line.trim().startsWith("Cooking time: ")) {
parseCookingTime(stack); parseCookingTime(stack);
parseEmptyLine(stack, lastCharRange); parseEmptyLine(stack, lastCharRange);
} }
// Check if exists and parse oven temperature // Check if exists and parse oven temperature
assertCodeStackNotEmpty(stack, lastCharRange);
if (stack[stack.length - 1].line.trim().startsWith("Pre-heat oven ")) { if (stack[stack.length - 1].line.trim().startsWith("Pre-heat oven ")) {
parseOvenSetting(stack); parseOvenSetting(stack);
parseEmptyLine(stack, lastCharRange); parseEmptyLine(stack, lastCharRange);
@ -349,3 +352,16 @@ const popCodeStack = (
const line = trim ? item.line.trim() : item.line; const line = trim ? item.line.trim() : item.line;
return { line, row: item.row }; return { line, row: item.row };
}; };
/**
* Utility to assert that given code stack is not empty.
* If it is, throws a ParseError for unexpected EOF for the given DocumentRange.
* @param stack Code stack to assert on
* @param range DocumentRange to throw ParseError on
*/
const assertCodeStackNotEmpty = (
stack: CodeStack,
range: DocumentRange
): void => {
if (stack.length == 0) throw new ParseError("Unexpected EOF", range);
};