n0m/Template-Engine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow empty comments

Browse Source
This commit is contained in:
Ben Ashton 2022-09-05 19:11:11 -06:00
parent cd1d14ee8b
commit d9749da99f
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/token_stream.mjs
View File

@ -2,6 +2,7 @@ import { CharacterStream } from './character_stream.mjs';
import { TemplateSyntaxError } from './errors/template_syntax_error.mjs'; import { TemplateSyntaxError } from './errors/template_syntax_error.mjs';
export class TokenStream { export class TokenStream {
static ESCAPE = '\\';
static OPEN_INLINE = '<%'; static OPEN_INLINE = '<%';
static CLOSE_INLINE = '%>'; static CLOSE_INLINE = '%>';
static OPEN_INLINE_UNESCAPED = '<!%'; static OPEN_INLINE_UNESCAPED = '<!%';
@ -62,6 +63,11 @@ export class TokenStream {
// Skip shebang (can be used to execute templates directly with an // Skip shebang (can be used to execute templates directly with an
// interpreter that first builds the template and then executes) // interpreter that first builds the template and then executes)
this._skipShebang(); this._skipShebang();
} else if (this._cs.isNext(TokenStream.ESCAPE)) {
// Skip space
this._cs.next();
// Treat everything as raw until next space
raw += this._cs.nextWhile((c) => /\S/.test(c));
} else if (this._cs.isNext(TokenStream.OPEN_INLINE)) { } else if (this._cs.isNext(TokenStream.OPEN_INLINE)) {
return flushRaw() || this._readInline(); return flushRaw() || this._readInline();
} else if (this._cs.isNext(TokenStream.OPEN_INLINE_UNESCAPED)) { } else if (this._cs.isNext(TokenStream.OPEN_INLINE_UNESCAPED)) {
@ -174,13 +180,13 @@ export class TokenStream {
// Skip tag // Skip tag
this._cs.next(tag.length); this._cs.next(tag.length);
// Check for mandatory space // Check for mandatory space/tab/new line
if (this._cs.peek() !== ' ') { if (this._isSpace(this._cs.peek())) {
this._missingFullLineSpaceError(tag);
}
// Consume space // Consume space
this._cs.next(); this._cs.next();
} else if (/[^\r\n]/.test(this._cs.peek())) {
this._missingFullLineSpaceError(tag);
}
// Remainder of line is value // Remainder of line is value
const value = this._cs.nextWhile((c) => c !== '\n'); const value = this._cs.nextWhile((c) => c !== '\n');