Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-28 11:39:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prepare some Sieve restructuring for GUI

Browse source
This commit is contained in:
the-djmaze 2022-03-17 09:03:02 +01:00
parent 37bb9a9a97
commit ff9a89380c
15 changed files with 259 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

21
dev/Sieve/Parser.js
View file

@ -23,22 +23,25 @@ import {
GrammarNumber,
GrammarQuotedString,
GrammarStringList,
GrammarTest,
TestCommand,
GrammarTestList
} from 'Sieve/Grammar';
import {
ConditionalCommand,
DiscardCommand,
FileIntoCommand,
KeepCommand,
RedirectCommand
} from 'Sieve/Commands/Actions';
import {
ConditionalCommand,
ElsIfCommand,
ElseCommand,
FileIntoCommand,
IfCommand,
KeepCommand,
RedirectCommand,
RequireCommand,
StopCommand
} from 'Sieve/Commands';
} from 'Sieve/Commands/Controls';
import {
AddressTest,
@ -51,7 +54,7 @@ import {
NotTest,
SizeTest,
TrueTest
} from 'Sieve/Tests';
} from 'Sieve/Commands/Tests';
import { BodyTest } from 'Sieve/Extensions/rfc5173';
import { EnvironmentTest } from 'Sieve/Extensions/rfc5183';
@ -265,14 +268,14 @@ export const parseScript = (script, name = 'script.sieve') => {
|| command instanceof NotTest
|| command.tests instanceof GrammarTestList)) {
console.error('Unknown test: ' + value);
new_command = new GrammarTest(value);
new_command = new TestCommand(value);
} else {
console.error('Unknown command: ' + value);
new_command = new GrammarCommand(value);
}
}
if (new_command instanceof GrammarTest) {
if (new_command instanceof TestCommand) {
if (command instanceof ConditionalCommand || command instanceof NotTest) {
// if/elsif/else new_command
// not new_command