restricted name pattern (#151, rggen/rggen#233)

rggen · Jan 15, 2025 · 956aa5d · 956aa5d
1 parent c56640e
commit 956aa5d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/lib/rggen/core/utility/regexp_patterns.rb b/lib/rggen/core/utility/regexp_patterns.rb
@@ -12,7 +12,7 @@ def included(klass)
 
         private
 
-        VARIABLE_NAME_PATTERN = /[a-z_]\w*/i
+        VARIABLE_NAME_PATTERN = /[a-z]\w+/i
 
         def variable_name
           VARIABLE_NAME_PATTERN

diff --git a/spec/rggen/core/utility/regexp_patterns_spec.rb b/spec/rggen/core/utility/regexp_patterns_spec.rb
@@ -15,21 +15,20 @@ def regexp_pattern(type)
     describe '#variable_name' do
       it '識別子名にマッチするす' do
         [
-          /_/i,
-          /_+/i,
-          /[a-z]/i,
-          /[a-z]+/i,
-          /_\d/i,
-          /_\d+/i,
+          /[a-z]{2,}/i,
           /[a-z]\d/i,
           /[a-z]\d+/i,
-          /[_a-z]\w+/i
+          /[a-z]\w+/i
         ].each do |pattern|
           string = random_string(pattern)
           expect(string).to match(regexp_pattern(:variable_name))
         end
 
         [
+          /_/,
+          /_+/,
+          /_\w+/,
+          /[a-z]/i,
           /\d/i,
           /\d+/i,
           /\d_/i,