j/Mind_Reader
1
0
Fork 0
mirror of https://github.com/We-Dont-Byte/Mind_Reader.git synced 2024-11-15 03:35:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update tests to match new behavior

Browse Source
This commit is contained in:
John 2022-04-30 17:17:28 -05:00
parent 34d89386ea
commit e0b2e5ee92
4 changed files with 101 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/test/suites/pylex/lexer.test.ts
View File

@ -12,7 +12,7 @@ suite('Lexer Test Suite', () => {
}); });
test('Empty String', () => { test('Empty String', () => {
let l: Lexer = new Lexer(undefined); let l: Lexer = new Lexer("");
assert.deepStrictEqual(l.currToken(), EOFTOKEN); assert.deepStrictEqual(l.currToken(), EOFTOKEN);
}); });
@ -22,18 +22,19 @@ suite('Lexer Test Suite', () => {
}); });
test('Whitespace', () => { test('Whitespace', () => {
let l: Lexer = new Lexer(' \t\t'.repeat(4).repeat(4)); let s: string = ' '.repeat(4).repeat(4);
assert.deepStrictEqual(l.currToken(), new LineToken(Symbol.EMPTY, 0, 999999)); let l: Lexer = new Lexer(s);
assert.deepStrictEqual(l.currToken(), new LineToken(Symbol.EMPTY, 0, s.length/4));
}); });
test('Comment', () => { test('Comment', () => {
let l: Lexer = new Lexer('# ur mom eats toes'); let l: Lexer = new Lexer('# this is a comment');
assert.deepStrictEqual(l.currToken(), new LineToken(Symbol.EMPTY, 0, 999999)); assert.deepStrictEqual(l.currToken(), new LineToken(Symbol.COMMENT, 0, 0, 'this is a comment'));
}); });
test('Non-Whitespace with no construct', () => { test('Non-Whitespace with no construct', () => {
let l: Lexer = new Lexer('foobar'); let l: Lexer = new Lexer('foobar');
assert.deepStrictEqual(l.currToken(), new LineToken(Symbol.INDENT, 0, 0)); assert.deepStrictEqual(l.currToken(), new LineToken(Symbol.STATEMENT, 0, 0, 'foobar'));
}); });
test('getIndent() accuracy, spaces', () => { test('getIndent() accuracy, spaces', () => {
@ -50,11 +51,14 @@ suite('Lexer Test Suite', () => {
} }
}); });
test('getIndent() accuracy, spaces with incomplete tab', () => { test('getIndent() accuracy, spaces with incomplete indentation', () => {
let size: number = 4;
for (var i = 0; i < 100; i++) { for (var i = 0; i < 100; i++) {
for (var j = 1; j <= 3; j++) { for (var j = 1; j <= 3; j++) {
let l: Lexer = new Lexer(' '.repeat(i) + ' '.repeat(j) + 'foobar', {size: 4, hard: false}); let l: Lexer = new Lexer(' '.repeat(i) + ' '.repeat(j) + 'foobar', {size: size, hard: false});
assert.strictEqual(l.currToken().indentLevel, i+1); // TODO: Swap these out when fractional indentation is used
//assert.strictEqual(l.currToken().indentLevel, i + (Math.round(j / size * 100) / 100));
assert.strictEqual(l.currToken().indentLevel, i + 1);
} }
} }
}); });
@ -150,7 +154,7 @@ suite('Lexer Test Suite', () => {
test('retract() 1-100', () => { test('retract() 1-100', () => {
let lines: string[] = Array.from(Array(100), (_, i) => 'line' + i); let lines: string[] = Array.from(Array(100), (_, i) => 'line' + i);
let reference: LineToken[] = lines.map((_, i) => { let reference: LineToken[] = lines.map((_, i) => {
return new LineToken(Symbol.INDENT, i, 0); return new LineToken(Symbol.STATEMENT, i, 0, `line${i}`);
}); });
for (var i = 0; i < 100; i++) { for (var i = 0; i < 100; i++) {
@ -169,7 +173,7 @@ suite('Lexer Test Suite', () => {
test('2 full lex and retract passes', () => { test('2 full lex and retract passes', () => {
let lines: string[] = Array.from(Array(100), (_, i)=> 'line' + i); let lines: string[] = Array.from(Array(100), (_, i)=> 'line' + i);
let reference: LineToken[] = lines.map((_, i) => { let reference: LineToken[] = lines.map((_, i) => {
return new LineToken(Symbol.INDENT, i, 0); return new LineToken(Symbol.STATEMENT, i, 0, `line${i}`);
}); });
let l: Lexer = new Lexer(lines.join('\n')); let l: Lexer = new Lexer(lines.join('\n'));

2
src/test/suites/pylex/node.test.ts
View File

@ -13,7 +13,7 @@ suite('LexNode Test Suite', () => {
}); });
test('children() of leaf', () => { test('children() of leaf', () => {
let n: LexNode = new LexNode('leafLexNode', vscode.TreeItemCollapsibleState.None, new LineToken(Symbol.INDENT, 0, 0)); let n: LexNode = new LexNode('leafLexNode', vscode.TreeItemCollapsibleState.None, new LineToken(Symbol.STATEMENT, 0, 0));
assert.strictEqual(n.children(), null); assert.strictEqual(n.children(), null);
}); });

157
src/test/suites/pylex/parser.test.ts
View File

@ -7,7 +7,7 @@ import LexNode from '../../../pylex/node';
import LineToken from '../../../pylex/token'; import LineToken from '../../../pylex/token';
import { Symbol } from '../../../pylex/token'; import { Symbol } from '../../../pylex/token';
import { root,indent,empty } from '../../util'; import { root, statement } from '../../util';
/** /**
* Test Descriptor * Test Descriptor
@ -23,23 +23,24 @@ const tests: ParserTest[] = [
{ name: 'Single Empty Line', input: [''], output: root(null) }, { name: 'Single Empty Line', input: [''], output: root(null) },
{ {
name: 'Single Whitespace Only Line', name: 'Single Whitespace Only Line',
input: [' '], input: [' '], // length 20
output: root([ output: root([
empty(0) new LexNode(Symbol.EMPTY, 0, new LineToken(Symbol.EMPTY, 0, 20 / 4)) // 4 spaces per indent
]) ])
}, },
{ {
name: 'Single Comment Only Line', name: 'Single Comment Only Line',
input: ['# ur mom likes peas'], input: ['# this is a comment'],
output: root([ output: root([
empty(0) new LexNode(Symbol.EMPTY, 0, new LineToken(Symbol.COMMENT, 0, 0, "this is a comment"))
]) ])
}, },
{ {
name: 'Single Non-Control Line', name: 'Single Non-Control Line',
input: ['my_age = 42'], input: ['my_age = 42'],
output: root([ output: root([
indent(0, 0) //statement(0, 0)
new LexNode("name", 0, new LineToken(Symbol.STATEMENT, 0, 0, 'my_age = 42'))
]) ])
}, },
{ {
@ -55,7 +56,10 @@ const tests: ParserTest[] = [
'bar = "Blue M&Ms make me happy <:)"', 'bar = "Blue M&Ms make me happy <:)"',
'reba = "A hard working gal"' 'reba = "A hard working gal"'
], ],
output: root([indent(0,0), indent(1,0)]), output: root([
new LexNode("name", 0, new LineToken(Symbol.STATEMENT, 0, 0, 'bar = "Blue M&Ms make me happy <:)"')),
new LexNode("name", 0, new LineToken(Symbol.STATEMENT, 1, 0, 'reba = "A hard working gal"'))
]),
}, },
{ {
@ -66,11 +70,13 @@ const tests: ParserTest[] = [
'billy = "Scrubbly Bubbles!"' 'billy = "Scrubbly Bubbles!"'
], ],
output: root([ output: root([
new LexNode('if radioshack', new LexNode('if radioshack', 0,
vscode.TreeItemCollapsibleState.None,
new LineToken(Symbol.IF, 0, 0, 'radioshack'), new LineToken(Symbol.IF, 0, 0, 'radioshack'),
[indent(1, 1)]), [
indent(2, 0) new LexNode('print radioshack.hours', 0, new LineToken(Symbol.STATEMENT, 1, 1, 'print radioshack.hours'))
]
),
new LexNode('billy = "Scrubbly Bubbles!"', 0, new LineToken(Symbol.STATEMENT, 2, 0, 'billy = "Scrubbly Bubbles!"'))
]) ])
}, },
@ -82,11 +88,12 @@ const tests: ParserTest[] = [
' print radioshack.hours' ' print radioshack.hours'
], ],
output: root([ output: root([
indent(0, 0), new LexNode('billy = "Scrubbly Bubbles!"', 0, new LineToken(Symbol.STATEMENT, 0, 0, 'billy = "Scrubbly Bubbles!"')),
new LexNode('if radioshack', new LexNode('if radioshack', 0, new LineToken(Symbol.IF, 1, 0, 'radioshack'),
vscode.TreeItemCollapsibleState.None, [
new LineToken(Symbol.IF, 1, 0, 'radioshack'), new LexNode('print radioshack.hours', 0, new LineToken(Symbol.STATEMENT, 2, 1, 'print radioshack.hours'))
[indent(2, 1)]) ]
)
]) ])
}, },
@ -101,15 +108,18 @@ const tests: ParserTest[] = [
' print("You really eat this?")', ' print("You really eat this?")',
], ],
output: root([ output: root([
new LexNode('if yummy', new LexNode('if yummy', 0, new LineToken(Symbol.IF, 0, 0, 'yummy'),
vscode.TreeItemCollapsibleState.None, [
new LineToken(Symbol.IF, 0, 0, 'yummy'), [indent(1, 1)]), statement(1, 1, 'print("HOoray!")')
new LexNode('elif just_ok', ]),
vscode.TreeItemCollapsibleState.None, new LexNode('elif just_ok', 0, new LineToken(Symbol.ELIF, 2, 0, 'just_ok'),
new LineToken(Symbol.ELIF, 2, 0, 'just_ok'), [indent(3, 1)]), [
new LexNode('else', statement(3, 1, 'print("Do you have anything else?")')
vscode.TreeItemCollapsibleState.None, ]),
new LineToken(Symbol.ELSE, 4, 0), [indent(5,1)]), new LexNode('else', 0, new LineToken(Symbol.ELSE, 4, 0),
[
statement(5, 1, 'print("You really eat this?")')
]),
]) ])
}, },
@ -122,13 +132,14 @@ const tests: ParserTest[] = [
], ],
output: root([ output: root([
new LexNode('if yummy', new LexNode('if yummy',
vscode.TreeItemCollapsibleState.None, 0,
new LineToken(Symbol.IF, 0, 0, 'yummy'), new LineToken(Symbol.IF, 0, 0, 'yummy'),
[ [
new LexNode('if in_my_tummy', new LexNode('if in_my_tummy', 0, new LineToken(Symbol.IF, 1, 1, 'in_my_tummy'),
vscode.TreeItemCollapsibleState.None, [
new LineToken(Symbol.IF, 1, 1, 'in_my_tummy'), statement(2, 2, 'exclaim("Scrumdiddlyumptious!")')
[indent(2, 2)]) ]
)
], ],
) )
]) ])
@ -141,23 +152,20 @@ const tests: ParserTest[] = [
' if in_my_tummy:', ' if in_my_tummy:',
' exclaim("Scrumdiddlyumptious!")', ' exclaim("Scrumdiddlyumptious!")',
'else:', 'else:',
' exclaim("DAESGUSTEN~)"' ' exclaim("DISGUSTING!")'
], ],
output: root([ output: root([
new LexNode('if yummy', new LexNode('if yummy', 0, new LineToken(Symbol.IF, 0, 0, 'yummy'),
vscode.TreeItemCollapsibleState.None,
new LineToken(Symbol.IF, 0, 0, 'yummy'),
[ [
new LexNode('if in_my_tummy', new LexNode('if in_my_tummy', 0, new LineToken(Symbol.IF, 1, 1, 'in_my_tummy'),
vscode.TreeItemCollapsibleState.None, [
new LineToken(Symbol.IF, 1, 1, 'in_my_tummy'), statement(2, 2, 'exclaim("Scrumdiddlyumptious!")')
[indent(2, 2)]) ]
)
] ]
), ),
new LexNode('else', new LexNode('else', 0, new LineToken(Symbol.ELSE, 3, 0),
vscode.TreeItemCollapsibleState.None, [statement(4, 1, 'exclaim("DISGUSTING!")')]
new LineToken(Symbol.ELSE, 3, 0),
[indent(4, 1)]
) )
]) ])
}, },
@ -168,31 +176,27 @@ const tests: ParserTest[] = [
'if yummy:', 'if yummy:',
' if in_my_tummy:', ' if in_my_tummy:',
' if looks_like_a_mummy:', ' if looks_like_a_mummy:',
' print("you have a spot on your tummy"', ' print("you have a spot on your tummy")',
'else:', 'else:',
' print("Food is food...")' ' print("Food is food...")'
], ],
output: root([ output: root([
new LexNode('if yummy', new LexNode('if yummy',
vscode.TreeItemCollapsibleState.None, 0,
new LineToken(Symbol.IF, 0, 0, 'yummy'), new LineToken(Symbol.IF, 0, 0, 'yummy'),
[ [
new LexNode('if in_my_tummy', new LexNode('if in_my_tummy', 0, new LineToken(Symbol.IF, 1, 1, 'in_my_tummy'),
vscode.TreeItemCollapsibleState.None,
new LineToken(Symbol.IF, 1, 1, 'in_my_tummy'),
[ [
new LexNode('if looks_like_a_mummy', new LexNode('if looks_like_a_mummy', 0, new LineToken(Symbol.IF, 2, 2, 'looks_like_a_mummy'),
vscode.TreeItemCollapsibleState.None, [statement(3, 3, 'print("you have a spot on your tummy")')])
new LineToken(Symbol.IF, 2, 2, 'looks_like_a_mummy'),
[indent(3, 3)])
] ]
) )
] ]
), ),
new LexNode('else', new LexNode('else',
vscode.TreeItemCollapsibleState.None, 0,
new LineToken(Symbol.ELSE, 4, 0), new LineToken(Symbol.ELSE, 4, 0),
[indent(5, 1)] [statement(5, 1, 'print("Food is food...")')]
) )
]) ])
}, },
@ -203,44 +207,42 @@ const tests: ParserTest[] = [
'if yummy:', 'if yummy:',
' if in_my_tummy:', ' if in_my_tummy:',
' if looks_like_a_mummy:', ' if looks_like_a_mummy:',
' print("you have a spot on your tummy"', ' print("you have a spot on your tummy")',
' else:', ' else:',
' print("eek! a zombie!)', ' print("eek! a zombie!")',
' elif in_my_mouth:', ' elif in_my_mouth:',
' print("itll be in my tummy soon!"', ' print("itll be in my tummy soon!")',
'else:', 'else:',
' print("Food is food...")' ' print("Food is food...")'
], ],
output: root([ output: root([
new LexNode('if yummy', new LexNode('if yummy', 0,
vscode.TreeItemCollapsibleState.None,
new LineToken(Symbol.IF, 0, 0, 'yummy'), new LineToken(Symbol.IF, 0, 0, 'yummy'),
[ [
new LexNode('if in_my_tummy', new LexNode('if in_my_tummy', 0,
vscode.TreeItemCollapsibleState.None,
new LineToken(Symbol.IF, 1, 1, 'in_my_tummy'), new LineToken(Symbol.IF, 1, 1, 'in_my_tummy'),
[ [
new LexNode('if looks_like_a_mummy', new LexNode('if looks_like_a_mummy',
vscode.TreeItemCollapsibleState.None, 0,
new LineToken(Symbol.IF, 2, 2, 'looks_like_a_mummy'), new LineToken(Symbol.IF, 2, 2, 'looks_like_a_mummy'),
[indent(3, 3)]), [statement(3, 3, 'print("you have a spot on your tummy")')]),
new LexNode('else', new LexNode('else',
vscode.TreeItemCollapsibleState.None, 0,
new LineToken(Symbol.ELSE, 4, 2), new LineToken(Symbol.ELSE, 4, 2),
[indent(5, 3)]) [statement(5, 3, 'print("eek! a zombie!")')])
] ]
), ),
new LexNode('elif in_my_mouth', new LexNode('elif in_my_mouth',
vscode.TreeItemCollapsibleState.None, 0,
new LineToken(Symbol.ELIF, 6, 1, 'in_my_mouth'), new LineToken(Symbol.ELIF, 6, 1, 'in_my_mouth'),
[indent(7, 2)] [statement(7, 2, 'print("itll be in my tummy soon!")')]
) )
] ]
), ),
new LexNode('else', new LexNode('else',
vscode.TreeItemCollapsibleState.None, 0,
new LineToken(Symbol.ELSE, 8, 0), new LineToken(Symbol.ELSE, 8, 0),
[indent(9, 1)] [statement(9, 1, 'print("Food is food...")')]
) )
]) ])
}, },
@ -248,21 +250,24 @@ const tests: ParserTest[] = [
name: 'Multiline Block', name: 'Multiline Block',
input: [ input: [
'if yummy:', 'if yummy:',
' print("you have a spot on your tummy"', ' print("you have a spot on your tummy")',
' print("eek! a zombie!)', ' print("eek! a zombie!)',
' print("itll be in my tummy soon!"', ' print("itll be in my tummy soon!")',
'else:', 'else:',
' print("Food is food...")' ' print("Food is food...")'
], ],
output: root([ output: root([
new LexNode('if yummy', 0, new LineToken(Symbol.IF, 0, 0, 'yummy'), new LexNode('if yummy', 0, new LineToken(Symbol.IF, 0, 0, 'yummy'),
[ [
indent(1, 1), statement(1, 1, 'print("you have a spot on your tummy")'),
indent(2, 1), statement(2, 1, 'print("eek! a zombie!)'),
indent(3, 1), statement(3, 1, 'print("itll be in my tummy soon!")'),
] ]
), ),
new LexNode('else', 0, new LineToken(Symbol.ELSE, 4, 0), [indent(5, 1)]) new LexNode('else', 0, new LineToken(Symbol.ELSE, 4, 0),
[
statement(5, 1, 'print("Food is food...")')
])
]) ])
} }
]; ];

8
src/test/util.ts
View File

@ -50,19 +50,19 @@ function root(nodes: LexNode[] | null): LexNode {
} }
/* short hand for returning an indentation token for a certain line and indentation */ /* short hand for returning an indentation token for a certain line and indentation */
function indent(linenr: number, indentLevel: number): LexNode { function statement(linenr: number, indentLevel: number, text: string = ""): LexNode {
return new LexNode('INDENT', 0, new LineToken(PylexSymbol.INDENT, linenr, indentLevel)); return new LexNode(PylexSymbol.STATEMENT, 0, new LineToken(PylexSymbol.STATEMENT, linenr, indentLevel, text));
} }
/* short hand for returning an empty token for a certain line*/ /* short hand for returning an empty token for a certain line*/
function empty(linenr: number): LexNode { function empty(linenr: number): LexNode {
return new LexNode('EMPTY', 0, new LineToken(PylexSymbol.EMPTY, linenr, 999999)); return new LexNode(PylexSymbol.EMPTY, 0, new LineToken(PylexSymbol.EMPTY, linenr, 999999));
} }
export { export {
deparent, deparent,
root, root,
indent, statement as statement,
empty empty
}; };