Skip to content

Commit

Permalink
defined operator
Browse files Browse the repository at this point in the history
  • Loading branch information
@TommYDeeee
TommYDeeee committed Mar 21, 2024
1 parent 0a7b3d0 commit 2b808f9
Show file tree
Hide file tree
Showing 8 changed files with 78 additions and 6 deletions.
3 changes: 3 additions & 0 deletions src/lexer/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ pub(crate) enum LogosToken {
IEquals,
#[token("matches")]
Matches,
#[token("defined")]
Defined,

// Patterns
#[regex(r"/(([^\\/\n])|(\\.))+/[a-zA-Z0-9]*", |lex| lex.slice().to_string())]
Expand Down Expand Up @@ -270,6 +272,7 @@ fn logos_tokenkind_to_syntaxkind(token: LogosToken) -> SyntaxKind {
LogosToken::IEndsWith => SyntaxKind::IENDSWITH_KW,
LogosToken::IEquals => SyntaxKind::IEQUALS_KW,
LogosToken::Matches => SyntaxKind::MATCHES_KW,
LogosToken::Defined => SyntaxKind::DEFINED_KW,
LogosToken::Identifier(_) => SyntaxKind::IDENTIFIER,
LogosToken::Variable(_) => SyntaxKind::VARIABLE,
LogosToken::String(_) => SyntaxKind::STRING_LIT,
Expand Down
3 changes: 3 additions & 0 deletions src/parser/grammar/expressions.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,9 @@ fn boolean_term(p: &mut Parser) -> Option<CompletedMarker> {
p.bump(T![variable]);
} else if p.at(T![bool_lit]) {
p.bump(T![bool_lit]);
} else if p.at(T![defined]) {
p.bump(T![defined]);
boolean_term(p);
} else {
expr_stmt(p, None, 1);
}
Expand Down
5 changes: 4 additions & 1 deletion src/parser/syntax_kind/generated.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ pub enum SyntaxKind {
IENDSWITH_KW,
IEQUALS_KW,
MATCHES_KW,
DEFINED_KW,
STRING_LIT,
INT_LIT,
FLOAT_LIT,
Expand Down Expand Up @@ -144,6 +145,7 @@ impl SyntaxKind {
| IENDSWITH_KW
| IEQUALS_KW
| MATCHES_KW
| DEFINED_KW
)
}
pub fn is_punct(self) -> bool {
Expand Down Expand Up @@ -210,6 +212,7 @@ impl SyntaxKind {
"iendswith" => IENDSWITH_KW,
"iequals" => IEQUALS_KW,
"matches" => MATCHES_KW,
"defined" => DEFINED_KW,
_ => return None,
};
Some(kw)
Expand Down Expand Up @@ -244,5 +247,5 @@ impl SyntaxKind {
}
}
#[macro_export]
macro_rules ! T { [:] => { $ crate :: SyntaxKind :: COLON } ; ['('] => { $ crate :: SyntaxKind :: L_PAREN } ; [')'] => { $ crate :: SyntaxKind :: R_PAREN } ; ['{'] => { $ crate :: SyntaxKind :: L_BRACE } ; ['}'] => { $ crate :: SyntaxKind :: R_BRACE } ; ['['] => { $ crate :: SyntaxKind :: L_BRACKET } ; [']'] => { $ crate :: SyntaxKind :: R_BRACKET } ; [,] => { $ crate :: SyntaxKind :: COMMA } ; [=] => { $ crate :: SyntaxKind :: ASSIGN } ; [-] => { $ crate :: SyntaxKind :: HYPHEN } ; [?] => { $ crate :: SyntaxKind :: QUESTION_MARK } ; [~] => { $ crate :: SyntaxKind :: TILDE } ; [|] => { $ crate :: SyntaxKind :: PIPE } ; [/] => { $ crate :: SyntaxKind :: SLASH } ; [+] => { $ crate :: SyntaxKind :: PLUS } ; [*] => { $ crate :: SyntaxKind :: STAR } ; [%] => { $ crate :: SyntaxKind :: PERCENTAGE } ; [<<] => { $ crate :: SyntaxKind :: SHL } ; [>>] => { $ crate :: SyntaxKind :: SHR } ; [&] => { $ crate :: SyntaxKind :: AMPERSAND } ; [^] => { $ crate :: SyntaxKind :: CARET } ; [.] => { $ crate :: SyntaxKind :: DOT } ; [==] => { $ crate :: SyntaxKind :: EQ } ; [!=] => { $ crate :: SyntaxKind :: NE } ; [<] => { $ crate :: SyntaxKind :: LT } ; [<=] => { $ crate :: SyntaxKind :: LE } ; [>] => { $ crate :: SyntaxKind :: GT } ; [>=] => { $ crate :: SyntaxKind :: GE } ; [and] => { $ crate :: SyntaxKind :: AND_KW } ; [or] => { $ crate :: SyntaxKind :: OR_KW } ; [not] => { $ crate :: SyntaxKind :: NOT_KW } ; [rule] => { $ crate :: SyntaxKind :: RULE_KW } ; [strings] => { $ crate :: SyntaxKind :: STRINGS_KW } ; [condition] => { $ crate :: SyntaxKind :: CONDITION_KW } ; [meta] => { $ crate :: SyntaxKind :: META_KW } ; [private] => { $ crate :: SyntaxKind :: PRIVATE_KW } ; [global] => { $ crate :: SyntaxKind :: GLOBAL_KW } ; [import] => { $ crate :: SyntaxKind :: IMPORT_KW } ; [include] => { $ crate :: SyntaxKind :: INCLUDE_KW } ; [ascii] => { $ crate :: SyntaxKind :: ASCII_KW } ; [wide] => { $ crate :: SyntaxKind :: WIDE_KW } ; [nocase] => { $ crate :: SyntaxKind :: NOCASE_KW } ; [fullword] => { $ crate :: SyntaxKind :: FULLWORD_KW } ; [xor] => { $ crate :: SyntaxKind :: XOR_KW } ; [base64] => { $ crate :: SyntaxKind :: BASE64_KW } ; [base64wide] => { $ crate :: SyntaxKind :: BASE64WIDE_KW } ; [contains] => { $ crate :: SyntaxKind :: CONTAINS_KW } ; [icontains] => { $ crate :: SyntaxKind :: ICONTAINS_KW } ; [startswith] => { $ crate :: SyntaxKind :: STARTSWITH_KW } ; [istartswith] => { $ crate :: SyntaxKind :: ISTARTSWITH_KW } ; [endswith] => { $ crate :: SyntaxKind :: ENDSWITH_KW } ; [iendswith] => { $ crate :: SyntaxKind :: IENDSWITH_KW } ; [iequals] => { $ crate :: SyntaxKind :: IEQUALS_KW } ; [matches] => { $ crate :: SyntaxKind :: MATCHES_KW } ; [identifier] => { $ crate :: SyntaxKind :: IDENTIFIER } ; [variable] => { $ crate :: SyntaxKind :: VARIABLE } ; [string_lit] => { $ crate :: SyntaxKind :: STRING_LIT } ; [int_lit] => { $ crate :: SyntaxKind :: INT_LIT } ; [float_lit] => { $ crate :: SyntaxKind :: FLOAT_LIT } ; [bool_lit] => { $ crate :: SyntaxKind :: BOOL_LIT } ; [hex_lit] => { $ crate :: SyntaxKind :: HEX_LIT } ; [regex_lit] => { $ crate :: SyntaxKind :: REGEX_LIT } ; [dot_matches_all] => { $ crate :: SyntaxKind :: DOT_MATCHES_ALL } ; [case_insensitive] => { $ crate :: SyntaxKind :: CASE_INSENSITIVE } ; [backslash] => { $ crate :: SyntaxKind :: BACKSLASH } ; }
macro_rules ! T { [:] => { $ crate :: SyntaxKind :: COLON } ; ['('] => { $ crate :: SyntaxKind :: L_PAREN } ; [')'] => { $ crate :: SyntaxKind :: R_PAREN } ; ['{'] => { $ crate :: SyntaxKind :: L_BRACE } ; ['}'] => { $ crate :: SyntaxKind :: R_BRACE } ; ['['] => { $ crate :: SyntaxKind :: L_BRACKET } ; [']'] => { $ crate :: SyntaxKind :: R_BRACKET } ; [,] => { $ crate :: SyntaxKind :: COMMA } ; [=] => { $ crate :: SyntaxKind :: ASSIGN } ; [-] => { $ crate :: SyntaxKind :: HYPHEN } ; [?] => { $ crate :: SyntaxKind :: QUESTION_MARK } ; [~] => { $ crate :: SyntaxKind :: TILDE } ; [|] => { $ crate :: SyntaxKind :: PIPE } ; [/] => { $ crate :: SyntaxKind :: SLASH } ; [+] => { $ crate :: SyntaxKind :: PLUS } ; [*] => { $ crate :: SyntaxKind :: STAR } ; [%] => { $ crate :: SyntaxKind :: PERCENTAGE } ; [<<] => { $ crate :: SyntaxKind :: SHL } ; [>>] => { $ crate :: SyntaxKind :: SHR } ; [&] => { $ crate :: SyntaxKind :: AMPERSAND } ; [^] => { $ crate :: SyntaxKind :: CARET } ; [.] => { $ crate :: SyntaxKind :: DOT } ; [==] => { $ crate :: SyntaxKind :: EQ } ; [!=] => { $ crate :: SyntaxKind :: NE } ; [<] => { $ crate :: SyntaxKind :: LT } ; [<=] => { $ crate :: SyntaxKind :: LE } ; [>] => { $ crate :: SyntaxKind :: GT } ; [>=] => { $ crate :: SyntaxKind :: GE } ; [and] => { $ crate :: SyntaxKind :: AND_KW } ; [or] => { $ crate :: SyntaxKind :: OR_KW } ; [not] => { $ crate :: SyntaxKind :: NOT_KW } ; [rule] => { $ crate :: SyntaxKind :: RULE_KW } ; [strings] => { $ crate :: SyntaxKind :: STRINGS_KW } ; [condition] => { $ crate :: SyntaxKind :: CONDITION_KW } ; [meta] => { $ crate :: SyntaxKind :: META_KW } ; [private] => { $ crate :: SyntaxKind :: PRIVATE_KW } ; [global] => { $ crate :: SyntaxKind :: GLOBAL_KW } ; [import] => { $ crate :: SyntaxKind :: IMPORT_KW } ; [include] => { $ crate :: SyntaxKind :: INCLUDE_KW } ; [ascii] => { $ crate :: SyntaxKind :: ASCII_KW } ; [wide] => { $ crate :: SyntaxKind :: WIDE_KW } ; [nocase] => { $ crate :: SyntaxKind :: NOCASE_KW } ; [fullword] => { $ crate :: SyntaxKind :: FULLWORD_KW } ; [xor] => { $ crate :: SyntaxKind :: XOR_KW } ; [base64] => { $ crate :: SyntaxKind :: BASE64_KW } ; [base64wide] => { $ crate :: SyntaxKind :: BASE64WIDE_KW } ; [contains] => { $ crate :: SyntaxKind :: CONTAINS_KW } ; [icontains] => { $ crate :: SyntaxKind :: ICONTAINS_KW } ; [startswith] => { $ crate :: SyntaxKind :: STARTSWITH_KW } ; [istartswith] => { $ crate :: SyntaxKind :: ISTARTSWITH_KW } ; [endswith] => { $ crate :: SyntaxKind :: ENDSWITH_KW } ; [iendswith] => { $ crate :: SyntaxKind :: IENDSWITH_KW } ; [iequals] => { $ crate :: SyntaxKind :: IEQUALS_KW } ; [matches] => { $ crate :: SyntaxKind :: MATCHES_KW } ; [defined] => { $ crate :: SyntaxKind :: DEFINED_KW } ; [identifier] => { $ crate :: SyntaxKind :: IDENTIFIER } ; [variable] => { $ crate :: SyntaxKind :: VARIABLE } ; [string_lit] => { $ crate :: SyntaxKind :: STRING_LIT } ; [int_lit] => { $ crate :: SyntaxKind :: INT_LIT } ; [float_lit] => { $ crate :: SyntaxKind :: FLOAT_LIT } ; [bool_lit] => { $ crate :: SyntaxKind :: BOOL_LIT } ; [hex_lit] => { $ crate :: SyntaxKind :: HEX_LIT } ; [regex_lit] => { $ crate :: SyntaxKind :: REGEX_LIT } ; [dot_matches_all] => { $ crate :: SyntaxKind :: DOT_MATCHES_ALL } ; [case_insensitive] => { $ crate :: SyntaxKind :: CASE_INSENSITIVE } ; [backslash] => { $ crate :: SyntaxKind :: BACKSLASH } ; }
pub use T;
9 changes: 6 additions & 3 deletions src/syntax/ast/generated/nodes.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,12 +444,12 @@ impl BooleanExpr {
pub fn and_token(&self) -> Option<SyntaxToken> {
support::token(&self.syntax, T![and])
}
pub fn boolean_expr(&self) -> Option<BooleanExpr> {
support::child(&self.syntax)
}
pub fn or_token(&self) -> Option<SyntaxToken> {
support::token(&self.syntax, T![or])
}
pub fn boolean_expr(&self) -> Option<BooleanExpr> {
support::child(&self.syntax)
}
}

#[derive(Debug, Clone, PartialEq, Eq, Hash)]
Expand Down Expand Up @@ -514,6 +514,9 @@ impl BooleanTerm {
pub fn boolean_term(&self) -> Option<BooleanTerm> {
support::child(&self.syntax)
}
pub fn defined_token(&self) -> Option<SyntaxToken> {
support::token(&self.syntax, T![defined])
}
pub fn l_paren_token(&self) -> Option<SyntaxToken> {
support::token(&self.syntax, T!['('])
}
Expand Down
1 change: 1 addition & 0 deletions src/syntax/tests/ast_src.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
"iendswith",
"iequals",
"matches",
"defined",
],
literals: &["STRING_LIT", "INT_LIT", "FLOAT_LIT", "HEX_LIT", "BOOL_LIT", "REGEX_LIT"],
tokens: &[
Expand Down
9 changes: 9 additions & 0 deletions tests/test23.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
//Rule comment
rule test
{
//Rule block comment
strings:
$b = "bar"
condition:
$b and not defined $b
}
46 changes: 46 additions & 0 deletions tests/test23.out
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
[email protected]
[email protected]
[email protected] "//Rule comment"
[email protected] "\n"
[email protected] "rule"
[email protected] " "
[email protected] "test"
[email protected] "\n"
[email protected]
[email protected] "{"
[email protected] "\n\t"
[email protected]
[email protected] "//Rule block comment"
[email protected] "\n\t"
[email protected] "strings"
[email protected] ":"
[email protected] "\n\t\t"
[email protected]
[email protected] "$b"
[email protected] " "
[email protected] "="
[email protected] " "
[email protected]
[email protected] "\"bar\""
[email protected] "\n\t"
[email protected]
[email protected] "condition"
[email protected] ":"
[email protected] "\n\t\t"
[email protected]
[email protected]
[email protected] "$b"
[email protected] " "
[email protected] "and"
[email protected] " "
[email protected]
[email protected] "not"
[email protected] " "
[email protected]
[email protected] "defined"
[email protected] " "
[email protected]
[email protected] "$b"
[email protected] "\n"
[email protected] "}"
[email protected] "\n"
8 changes: 6 additions & 2 deletions yara.ungram
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,11 @@ Condition =

BooleanExpr =
BooleanTerm
| BooleanTerm 'and' BooleanExpr
| BooleanTerm 'or' BooleanExpr
| BooleanTerm
(
'and'| 'or'
)
BooleanExpr

BooleanTerm =
'variable'
Expand All @@ -120,6 +123,7 @@ BooleanTerm =
Expr
| 'bool_lit'
| 'not' BooleanTerm
| 'defined' BooleanTerm
| '(' BooleanExpr ')'

Expr =
Expand Down

0 comments on commit 2b808f9

Please sign in to comment.