Make invalid regexps blow up at definition time, JRUBY-283 and JRUBY-200

olabini · olabini · commit be97fd873dd3 · 2006-11-28T10:43:54.000Z
git-svn-id: http://svn.codehaus.org/jruby/trunk/jruby@2508 961051c9-f516-0410-bf72-c9f7e237a7b7
diff --git a/src/org/jruby/RegexpTranslator.java b/src/org/jruby/RegexpTranslator.java
@@ -19,17 +19,11 @@ public class RegexpTranslator {
     private static final Pattern OCTAL_MISSING_ZERO_PATTERN = Pattern.compile("\\\\([1-7][0-7]{1,2})");
     private static final Pattern POSIX_NAME = Pattern.compile("\\[:(\\w+):\\]");
     
-    public Pattern translate(String regex, int options, int javaRegexFlags) {
+    public Pattern translate(String regex, int options, int javaRegexFlags) throws PatternSyntaxException {
     	javaRegexFlags |= translateFlags(options);
 		regex = translatePattern(regex, (javaRegexFlags & Pattern.COMMENTS) != 0);
 
-		// If we return null, rather than die this ends up generating a TypeError (which is better
-		// than crashing).
-		try {
-			return Pattern.compile(regex, javaRegexFlags);
-		} catch (PatternSyntaxException e) {}
-		
-		return null;
+                return Pattern.compile(regex, javaRegexFlags);
 	}
     
     // We do not check for pathological case of [:foo:] outside of [] (bug 1475096).
@@ -96,4 +90,4 @@ int translateFlags(int options) {
 		return flags;
 	}
 
-}
+}
diff --git a/src/org/jruby/RubyRegexp.java b/src/org/jruby/RubyRegexp.java
@@ -152,7 +152,11 @@ public static RubyClass createRegexpClass(IRuby runtime) {
     }
 
     public void initialize(String regex, int options) {
-        pattern = REGEXP_TRANSLATOR.translate(regex, options, code.flags());
+        try {
+            pattern = REGEXP_TRANSLATOR.translate(regex, options, code.flags());
+        } catch(java.util.regex.PatternSyntaxException e) {
+            throw getRuntime().newSyntaxError(e.getMessage());
+        }
     }
 
     public static String escapeSpecialChars(String original) {
@@ -224,7 +228,6 @@ public IRubyObject initialize(IRubyObject[] args) {
         } else {
         	code = Code.create(getRuntime(), null);
         }
-
         initialize(pat, opts);
         return getRuntime().getNil();
     }
diff --git a/src/org/jruby/ast/RegexpNode.java b/src/org/jruby/ast/RegexpNode.java
@@ -79,7 +79,7 @@ public String getValue() {
         return value;
     }
     
-    public Pattern getPattern() {
+    public Pattern getPattern() throws java.util.regex.PatternSyntaxException {
         if (pattern == null) {
             pattern = translator.translate(value, options, Pattern.UNIX_LINES);
         }
diff --git a/src/org/jruby/evaluator/EvaluationState.java b/src/org/jruby/evaluator/EvaluationState.java
@@ -1309,8 +1309,11 @@ private static IRubyObject evalInternal(ThreadContext context, Node node, IRubyO
                 } else if((opts & 64) != 0) { // param s
                     lang = "u";
                 }
-
-                return RubyRegexp.newRegexp(runtime, iVisited.getPattern(), lang);
+                try {
+                    return RubyRegexp.newRegexp(runtime, iVisited.getPattern(), lang);
+                } catch(java.util.regex.PatternSyntaxException e) {
+                    throw runtime.newSyntaxError(e.getMessage());
+                }
             }
             case NodeTypes.RESCUEBODYNODE: {
                 RescueBodyNode iVisited = (RescueBodyNode) node;

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,11 @@ public static RubyClass createRegexpClass(IRuby runtime) {`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`public void initialize(String regex, int options) {`
`155`		`- pattern = REGEXP_TRANSLATOR.translate(regex, options, code.flags());`
	`155`	`+ try {`
	`156`	`+ pattern = REGEXP_TRANSLATOR.translate(regex, options, code.flags());`
	`157`	`+ } catch(java.util.regex.PatternSyntaxException e) {`
	`158`	`+ throw getRuntime().newSyntaxError(e.getMessage());`
	`159`	`+ }`
`156`	`160`	`}`
`157`	`161`
`158`	`162`	`public static String escapeSpecialChars(String original) {`
`@@ -224,7 +228,6 @@ public IRubyObject initialize(IRubyObject[] args) {`
`224`	`228`	`} else {`
`225`	`229`	`code = Code.create(getRuntime(), null);`
`226`	`230`	`}`
`227`		`-`
`228`	`231`	`initialize(pat, opts);`
`229`	`232`	`return getRuntime().getNil();`
`230`	`233`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public String getValue() {`
`79`	`79`	`return value;`
`80`	`80`	`}`
`81`	`81`
`82`		`- public Pattern getPattern() {`
	`82`	`+ public Pattern getPattern() throws java.util.regex.PatternSyntaxException {`
`83`	`83`	`if (pattern == null) {`
`84`	`84`	`pattern = translator.translate(value, options, Pattern.UNIX_LINES);`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1309,8 +1309,11 @@ private static IRubyObject evalInternal(ThreadContext context, Node node, IRubyO`
`1309`	`1309`	`} else if((opts & 64) != 0) { // param s`
`1310`	`1310`	`lang = "u";`
`1311`	`1311`	`}`
`1312`		`-`
`1313`		`- return RubyRegexp.newRegexp(runtime, iVisited.getPattern(), lang);`
	`1312`	`+ try {`
	`1313`	`+ return RubyRegexp.newRegexp(runtime, iVisited.getPattern(), lang);`
	`1314`	`+ } catch(java.util.regex.PatternSyntaxException e) {`
	`1315`	`+ throw runtime.newSyntaxError(e.getMessage());`
	`1316`	`+ }`
`1314`	`1317`	`}`
`1315`	`1318`	`case NodeTypes.RESCUEBODYNODE: {`
`1316`	`1319`	`RescueBodyNode iVisited = (RescueBodyNode) node;`