Check for -1 instead of null pointer when validating path

Author: CedNaru

src/language/gdj_language.cpp

@@ -113,7 +113,7 @@ String GdjLanguage::get_global_class_name(const String& p_path, String* r_base_t
 }
 
 Vector<String> GdjLanguage::get_reserved_words() const {
-    return {
+    static const Vector<String> ret = {
         "registeredName",
         "fqName",
         "relativeSourcePath ",
@@ -123,14 +123,17 @@ Vector<String> GdjLanguage::get_reserved_words() const {
         "properties",
         "functions"
     };
+
+    return ret;
 }
 
 bool GdjLanguage::is_control_flow_keyword(const String& p_keyword) const {
     return false;
 }
 
 Vector<String> GdjLanguage::get_comment_delimiters() const {
-    return {"//"};
+    static const Vector<String> ret = {"//"};
+    return ret;
 }
 
 Vector<String> GdjLanguage::get_doc_comment_delimiters() const {return {};}

src/language/java_language.cpp

@@ -56,7 +56,7 @@ void JavaLanguage::get_recognized_extensions(List<String>* p_extensions) const {
 }
 
 Vector<String> JavaLanguage::get_reserved_words() const {
-    return {
+    static const Vector<String> ret = {
         "abstract",
         "assert",
         "boolean",
@@ -107,6 +107,8 @@ Vector<String> JavaLanguage::get_reserved_words() const {
         "volatile",
         "while"
     };
+
+    return ret;
 }
 
 bool JavaLanguage::is_control_flow_keyword(const String& p_keyword) const {
@@ -116,15 +118,18 @@ bool JavaLanguage::is_control_flow_keyword(const String& p_keyword) const {
 }
 
 Vector<String> JavaLanguage::get_comment_delimiters() const {
-    return {"//", "/* */"};
+    static const Vector<String> ret = {"//", "/* */"};
+    return ret;
 }
 
 Vector<String> JavaLanguage::get_doc_comment_delimiters() const {
-    return {"/** */"};
+    static const Vector<String> ret = {"/** */"};
+    return ret;
 }
 
 Vector<String> JavaLanguage::get_string_delimiters() const {
-    return {"' '", "\" \""};
+    static const Vector<String> ret = {"' '", "\" \""};
+    return ret;
 }
 
 Ref<Script> JavaLanguage::make_template(const String& p_template, const String& p_class_name, const String& p_base_class_name) const {

src/language/jvm_language.cpp

@@ -19,7 +19,7 @@ bool JvmLanguage::validate(
 
 String JvmLanguage::validate_path(const String& p_path) const {
     Vector <String> keywords = get_reserved_words();
-    if (keywords.find(p_path.get_file().get_basename())) {
+    if (keywords.find(p_path.get_file().get_basename()) != -1) {
         String alert {"Please don't use reserved keywords as file name."};
         return
 #ifdef TOOLS_ENABLED

src/language/kotlin_language.cpp

@@ -54,7 +54,7 @@ void KotlinLanguage::get_recognized_extensions(List<String>* p_extensions) const
 }
 
 Vector<String> KotlinLanguage::get_reserved_words() const {
-    return {// RESERVED KEYWORDS
+    static const Vector<String> ret = {// RESERVED KEYWORDS
         "as",
         "as?",
         "break",
@@ -137,6 +137,8 @@ Vector<String> KotlinLanguage::get_reserved_words() const {
         // SPECIAL IDENTIFIERS
         "it",
     };
+
+    return ret;
 }
 
 bool KotlinLanguage::is_control_flow_keyword(const String& p_keyword) const {
@@ -146,15 +148,18 @@ bool KotlinLanguage::is_control_flow_keyword(const String& p_keyword) const {
 }
 
 Vector<String> KotlinLanguage::get_comment_delimiters() const {
-    return {"//", "/* */"};
+    static const Vector<String> ret = {"//", "/* */"};
+    return ret;
 }
 
 Vector<String> KotlinLanguage::get_doc_comment_delimiters() const {
-    return {"/** */"};
+    static const Vector<String> ret = {"/** */"};
+    return ret;
 }
 
 Vector<String> KotlinLanguage::get_string_delimiters() const {
-    return {"' '", "\" \""};
+    static const Vector<String> ret = {"' '", "\" \""};
+    return ret;
 }
 
 Ref<Script> KotlinLanguage::make_template(const String& p_template, const String& p_class_name, const String& p_base_class_name) const {

src/language/scala_language.cpp

@@ -53,7 +53,7 @@ void ScalaLanguage::get_recognized_extensions(List<String>* p_extensions) const
 }
 
 Vector<String>  ScalaLanguage::get_reserved_words() const {
-    return {
+    static const Vector<String> ret = {
             "abstract",
             "case",
             "catch",
@@ -94,6 +94,8 @@ Vector<String>  ScalaLanguage::get_reserved_words() const {
             "with",
             "yield"
     };
+
+    return ret;
 }
 
 bool ScalaLanguage::is_control_flow_keyword(const String& p_keyword) const {
@@ -103,15 +105,18 @@ bool ScalaLanguage::is_control_flow_keyword(const String& p_keyword) const {
 }
 
 Vector<String>  ScalaLanguage::get_comment_delimiters() const {
-    return {"//", "/* */"};
+    static const Vector<String> ret = {"//", "/* */"};
+    return ret;
 }
 
 Vector<String>  ScalaLanguage::get_doc_comment_delimiters() const {
-    return {"/** */"};
+    static const Vector<String> ret = {"/** */"};
+    return ret;
 }
 
 Vector<String>  ScalaLanguage::get_string_delimiters() const {
-    return {"' '", "\" \"", "\"\"\" \"\"\""};
+    static const Vector<String> ret = {"' '", "\" \"", "\"\"\" \"\"\""};
+    return ret;
 }
 
 Ref<Script> ScalaLanguage::make_template(const String& p_template, const String& p_class_name, const String& p_base_class_name) const {