diff options
| -rw-r--r-- | scalastyle-config.xml | 2 | ||||
| -rw-r--r-- | scalastyle-test-config.xml | 2 | ||||
| -rw-r--r-- | src/main/scala/Chisel/internal/Error.scala | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/scalastyle-config.xml b/scalastyle-config.xml index a14fdfca..ab6b43be 100644 --- a/scalastyle-config.xml +++ b/scalastyle-config.xml @@ -90,7 +90,7 @@ <check level="warning" class="org.scalastyle.scalariform.MethodNamesChecker" enabled="true"> <parameters> <parameter name="regex"><![CDATA[^[a-z][A-Za-z0-9]*$]]></parameter> - <parameter name="ignoreRegex"><![CDATA[^(\+[&%]?|\-[&%]?|\*|/|%|&|\||\^|<|>|\|\||&&|:=|<>|<=|>=|!=|===|<<|>>|unary_(~|\-%?|!))$]]></parameter> + <parameter name="ignoreRegex"><![CDATA[^(\+[&%]?|\-[&%]?|\*|/|%|&|\||\^|<|>|\|\||&&|:=|<>|<=|>=|!=|===|<<|>>|##|unary_(~|\-%?|!))$]]></parameter> </parameters> </check> <check level="warning" class="org.scalastyle.scalariform.NumberOfMethodsInTypeChecker" enabled="true"> diff --git a/scalastyle-test-config.xml b/scalastyle-test-config.xml index 5dc2add0..6004b8d5 100644 --- a/scalastyle-test-config.xml +++ b/scalastyle-test-config.xml @@ -89,7 +89,7 @@ <check level="warning" class="org.scalastyle.scalariform.MethodNamesChecker" enabled="true"> <parameters> <parameter name="regex"><![CDATA[^[a-z][A-Za-z0-9]*$]]></parameter> - <parameter name="ignoreRegex"><![CDATA[^(\+[&%]?|\-[&%]?|\*|/|%|&|\||\^|<|>|\|\||&&|:=|<>|<=|>=|!=|===|<<|>>|unary_(~|\-%?|!))$]]></parameter> + <parameter name="ignoreRegex"><![CDATA[^(\+[&%]?|\-[&%]?|\*|/|%|&|\||\^|<|>|\|\||&&|:=|<>|<=|>=|!=|===|<<|>>|##|unary_(~|\-%?|!))$]]></parameter> </parameters> </check> <check level="warning" class="org.scalastyle.scalariform.NumberOfMethodsInTypeChecker" enabled="true"> diff --git a/src/main/scala/Chisel/internal/Error.scala b/src/main/scala/Chisel/internal/Error.scala index 30f6b527..4bfcb555 100644 --- a/src/main/scala/Chisel/internal/Error.scala +++ b/src/main/scala/Chisel/internal/Error.scala @@ -24,10 +24,10 @@ private class ErrorLog { /** Emit an informational message */ def info(m: String): Unit = - println(new Info("[%2.3f] %s".format(elapsedTime/1e3, m), None)) + println(new Info("[%2.3f] %s".format(elapsedTime/1e3, m), None)) // scalastyle:ignore regex /** Prints error messages generated by Chisel at runtime. */ - def report(): Unit = errors foreach println + def report(): Unit = errors foreach println // scalastyle:ignore regex /** Throw an exception if any errors have yet occurred. */ def checkpoint(): Unit = if(hasErrors) { |