Fix #11 - checking blanks and added \r as blank as well

Yara-Rules · Sep 18, 2017 · 3ab7156 · 3ab7156
1 parent b68198f
commit 3ab7156
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/lexic/helper.go b/lexic/helper.go
@@ -185,7 +185,7 @@ func isPercent(r rune) bool {
 
 // isBlank reports whether r is a black character
 func isBlank(r rune) bool {
-	return r == ' ' || r == '\t' || r == '\n'
+	return r == ' ' || r == '\t' || r == '\n' || r == '\r'
 }
 
 // isSpace reports whether r is a space character.

diff --git a/lexic/scanner.go b/lexic/scanner.go
@@ -54,8 +54,9 @@ func scanCommentOrRegex(l *Lexer) stateFn {
 
 		mod := ""
 		r = l.next()
-		if !isValidRegexpMod(r) {
-			l.errorf("Line %d: illegal regex modifier", l.Line)
+		fmt.Printf("%s -- '%s'", l.Name, string(r))
+		if !isBlank(r) && !isValidRegexpMod(r) {
+			l.errorf("Line %d: illegal regex modifier (%s)", l.Line, string(r))
 		}
 		for isValidRegexpMod(r) {
 			mod += string(r)

diff --git a/yago/yago.go b/yago/yago.go
@@ -15,11 +15,12 @@ import (
 )
 
 const (
-	MULTILINE = `\s*/\*([^*]|\*+[^*/])*\*+/\s*`
-	INLINE    = `(?m)\s*//.*[\n\r][\n\r]?`
-	BLANKS    = `(?m)\s+$`
-	QUOTES    = `"`
-	MAXBUFF   = 1024 * 1024 // If needed Go will take it form RAM.
+	MULTILINE   = `\s*/\*([^*]|\*+[^*/])*\*+/\s*`
+	INLINE      = `(?m)\s*//.*[\n\r][\n\r]?`
+	BLANKS      = `(?m)\s+$`
+	QUOTES      = `"`
+	MAXBUFF     = 1024 * 1024 // If needed Go will take it form RAM.
+	DEBUG_LEVEL = "INFO"
 )
 
 func NewParser(name string) *grammar.Parser {
@@ -31,7 +32,7 @@ func ProcessFile(fileName string) []*grammar.Parser {
 	checkErr(err)
 
 	p := NewParser(path.Base(fileName))
-	p.SetLogLevel("INFO")
+	p.SetLogLevel(DEBUG_LEVEL)
 	p.Parse(string(file))
 
 	var res []*grammar.Parser
@@ -54,7 +55,7 @@ func ProcessDir(dirName string) []*grammar.Parser {
 		checkErr(err)
 
 		p := NewParser(path.Base(filePath))
-		p.SetLogLevel("INFO")
+		p.SetLogLevel(DEBUG_LEVEL)
 		p.Parse(string(file))
 		res = append(res, p)
 	}
@@ -90,7 +91,7 @@ func ProcessIndex(indexFile, cwd string) []*grammar.Parser {
 				checkErr(err)
 
 				p := NewParser(path.Base(rulePath))
-				p.SetLogLevel("INFO")
+				p.SetLogLevel(DEBUG_LEVEL)
 				p.Parse(string(file))
 				res = append(res, p)
 			} else {