mirrors/bbob
2
0
Fork 0
mirror of https://github.com/tenrok/BBob.git synced 2026-06-17 19:21:20 +03:00
Code Activity

optimize Parser, remove while loop, add event to Tokenizer

Browse Source
This commit is contained in:
Nikolay Kostyurin
2018-06-25 00:53:49 +02:00
parent 2e0c17a4f1
commit 3e15b54efa
7 changed files with 270 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/bbob-parser/test/Parser.test.js
+2 -16
View File
@@ -1,23 +1,10 @@
const Parser = require('../lib/Parser');
const TOKEN = require('../lib/token');
const Tokenizer = require('../lib/Tokenizer');
const parse = input => (new Parser(input).parse());
const tokenize = input => (new Tokenizer(input).tokenize());
describe('Parser', () => {
test('parse paired tags tokens', () => {
const input = [
[TOKEN.TYPE_TAG, 'best'],
[TOKEN.TYPE_ATTR_NAME, 'name'],
[TOKEN.TYPE_ATTR_VALUE, 'value'],
[TOKEN.TYPE_WORD, 'Foo'],
[TOKEN.TYPE_SPACE, ' '],
[TOKEN.TYPE_WORD, 'Bar'],
[TOKEN.TYPE_TAG, '/best'],
];
const ast = parse(input);
const ast = parse('[best name=value]Foo Bar[/best]');
expect(ast).toBeInstanceOf(Array);
expect(ast).toEqual([
@@ -36,8 +23,7 @@ describe('Parser', () => {
});
test('parse tag with value param', () => {
const tokens = tokenize('[url=https://github.com/jilizart/bbob]BBob[/url]');
const ast = parse(tokens);
const ast = parse('[url=https://github.com/jilizart/bbob]BBob[/url]');
expect(ast).toBeInstanceOf(Array);
expect(ast).toEqual([
packages/bbob-parser/test/Tokenizer.test.js
+29 -21
View File
@@ -5,51 +5,60 @@ const { TYPE } = Tokenizer;
const tokenize = input => (new Tokenizer(input).tokenize());
describe('Tokenizer', () => {
const expectOutput = (output, tokens) => {
expect(tokens).toBeInstanceOf(Array);
output.forEach((token, idx) => {
expect(tokens[idx]).toBeInstanceOf(Object);
expect(tokens[idx]).toEqual(Tokenizer.createTokenOfType(...token));
});
};
test('tokenize single tag', () => {
const input = '[SingleTag]';
const tokens = tokenize(input);
expect(tokens).toBeInstanceOf(Array);
expect(tokens).toEqual([
const output = [
[TYPE.TAG, 'SingleTag', '0', '0'],
]);
];
expectOutput(output, tokens);
});
test('tokenize single tag with spaces', () => {
const input = '[Single Tag]';
const tokens = tokenize(input);
expect(tokens).toBeInstanceOf(Array);
expect(tokens).toEqual([
const output = [
[TYPE.TAG, 'Single Tag', '0', '0'],
]);
];
expectOutput(output, tokens);
});
test('tokenize tag as param', () => {
const input = '[color="#ff0000"]Text[/color]';
const tokens = tokenize(input);
expect(tokens).toBeInstanceOf(Array);
expect(tokens).toEqual([
const output = [
[TYPE.TAG, 'color', '0', '0'],
[TYPE.ATTR_VALUE, '#ff0000', '6', '0'],
[TYPE.WORD, 'Text', '17', '0'],
[TYPE.TAG, '/color', '21', '0'],
]);
];
expectOutput(output, tokens);
});
test('tokenize tag param without quotemarks', () => {
const input = '[style color=#ff0000]Text[/style]';
const tokens = tokenize(input);
expect(tokens).toBeInstanceOf(Array);
expect(tokens).toEqual([
const output = [
[TYPE.TAG, 'style', '0', '0'],
[TYPE.ATTR_NAME, 'color', '6', '0'],
[TYPE.ATTR_VALUE, '#ff0000', '12', '0'],
[TYPE.WORD, 'Text', '21', '0'],
[TYPE.TAG, '/style', '25', '0'],
]);
];
expectOutput(output, tokens);
});
test('tokenize list tag with items', () => {
@@ -60,9 +69,7 @@ describe('Tokenizer', () => {
[/list]`;
const tokens = tokenize(input);
expect(tokens).toBeInstanceOf(Array);
expect(tokens).toEqual([
const output = [
[TYPE.TAG, 'list', '0', '0'],
[TYPE.NEW_LINE, '\n', '6', '0'],
[TYPE.SPACE, ' ', '0', '1'],
@@ -93,7 +100,9 @@ describe('Tokenizer', () => {
[TYPE.WORD, '3.', '11', '3'],
[TYPE.NEW_LINE, '\n', '14', '3'],
[TYPE.TAG, '/list', '0', '4'],
]);
];
expectOutput(output, tokens);
});
test('tokenize bad tags as texts', () => {
@@ -140,8 +149,7 @@ describe('Tokenizer', () => {
inputs.forEach((input, idx) => {
const tokens = tokenize(input);
expect(tokens).toBeInstanceOf(Array);
expect(tokens).toEqual(asserts[idx]);
expectOutput(asserts[idx], tokens);
});
});
});