Skip to content

Commit

Permalink
refactor: Implemented Options.skipMacroDefs().
Browse files Browse the repository at this point in the history
  • Loading branch information
srackham committed Dec 14, 2019
1 parent 70253bb commit 34ecdb5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
3 changes: 1 addition & 2 deletions src/rimu/macros.ts
Expand Up @@ -42,8 +42,7 @@ export function getValue(name: string): string | null {
// If the name ends with '?' then don't set the macro if it already exists.
// `quote` is a single character: ' if a literal value, ` if an expression value.
export function setValue(name: string, value: string, quote: string): void {
// TODO: Implement this as Options.skipMacroDefs() c.f. rimu-kt
if (Options.getSafeMode() !== 0 && !(Options.getSafeMode() & 0x8)) { // tslint:disable-line no-bitwise
if (Options.skipMacroDefs()) {
return // Skip if a safe mode is set.
}
let existential = false;
Expand Down
11 changes: 9 additions & 2 deletions src/rimu/options.ts
Expand Up @@ -40,10 +40,17 @@ export function getSafeMode(): number {
return safeMode
}

// Return true if Macro Definitions are ignored.
export function skipMacroDefs(): boolean {
/* tslint:disable:no-bitwise */
return safeMode !== 0 && (safeMode & 0x8) === 0
/* tslint:enable:no-bitwise */
}

// Return true if Block Attribute elements are ignored.
export function skipBlockAttributes(): boolean {
/* tslint:disable:no-bitwise */
return safeMode !== 0 && !!(safeMode & 0x4)
return (safeMode & 0x4) !== 0
/* tslint:enable:no-bitwise */
}

Expand Down Expand Up @@ -120,7 +127,7 @@ export function htmlSafeModeFilter(html: string): string {

export function errorCallback(message: string): void {
if (callback) {
callback({type: 'error', text: message})
callback({ type: 'error', text: message })
}
}

Expand Down

0 comments on commit 34ecdb5

Please sign in to comment.