From ea1592e8a3799c158872787d72ace753d38c07db Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Mon, 9 Apr 2012 21:25:01 +0400 Subject: [PATCH] validate identifier names --- .../jetbrains/jet/lang/resolve/NameUtils.java | 36 +++++++++++++++++++ .../k2js/translate/context/NamingScope.java | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 compiler/frontend/src/org/jetbrains/jet/lang/resolve/NameUtils.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NameUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NameUtils.java new file mode 100644 index 00000000000..123446bc8a4 --- /dev/null +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NameUtils.java @@ -0,0 +1,36 @@ +/* + * Copyright 2010-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.lang.resolve; + +import org.jetbrains.annotations.NotNull; + +/** + * @author Stepan Koltsov + */ +public class NameUtils { + + public static boolean isValidIdentified(@NotNull String name) { + return name.length() > 0 && !name.startsWith("<"); + } + + public static void requireIdentifier(@NotNull String name) { + if (!isValidIdentified(name)) { + throw new IllegalArgumentException("invalid identifier: " + name); + } + } + +} diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/NamingScope.java b/js/js.translator/src/org/jetbrains/k2js/translate/context/NamingScope.java index 0ec6016f6be..cb078cfc2f9 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/context/NamingScope.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/context/NamingScope.java @@ -19,6 +19,7 @@ package org.jetbrains.k2js.translate.context; import com.google.dart.compiler.backend.js.ast.JsName; import com.google.dart.compiler.backend.js.ast.JsScope; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.resolve.NameUtils; import org.jetbrains.k2js.translate.utils.JsAstUtils; /** @@ -54,6 +55,7 @@ public final class NamingScope { @NotNull /*package*/ JsName declareUnobfuscatableName(@NotNull String name) { + NameUtils.requireIdentifier(name); JsName declaredName = scope.declareName(name); declaredName.setObfuscatable(false); return declaredName; -- GitLab