Fixed #13 Solved condition bug

Yara-Rules · Oct 14, 2017 · 2a7ff32 · 2a7ff32
1 parent d026942
commit 2a7ff32
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/grammar/grammar.go b/grammar/grammar.go
@@ -447,13 +447,13 @@ func (p *Parser) processCondition() string {
 	item := p.nextItem()
 	last = item
 	for !checkItemType(item, "__CLOSE_CURLY__") {
-		if checkItemType(last, "__DOT__") || checkItemType(last, "__DOT_DOT__") {
+		if checkItemType(last, "__DOT__") || checkItemType(last, "__DOT_DOT__") || checkItemType(last, "__AT__") {
 			space = ""
 		}
 		if checkItemType(item, "__HASH__") {
 			hash := item.GetValue()
 			item = p.nextItem()
-			if checkItemType(item, "__IDENTIFIER__") {
+			if checkItemType(item, "__IDENTIFIER__") || checkItemType(item, "__INT_NUMBER__") {
 				value += space + hash + item.GetValue()
 			} else {
 				p.errorf("Expected %s and found %s", lexic.ItemType["ItemIdentifier"], item.GetType())