Rename variables

Author: setchi

Assets/Hypertext/Examples/RegexHypertext.cs

@@ -5,17 +5,17 @@
 
 public class RegexHypertext : HypertextBase
 {
-    readonly Dictionary<string, RegexEntry> _regexEntryTable = new Dictionary<string, RegexEntry>();
+    readonly Dictionary<string, Entry> _entryTable = new Dictionary<string, Entry>();
 
-    struct RegexEntry
+    struct Entry
     {
-        public string Pattern;
+        public string RegexPattern;
         public Color Color;
         public Action<string> OnClick;
 
-        public RegexEntry(string pattern, Color color, Action<string> onClick)
+        public Entry(string regexPattern, Color color, Action<string> onClick)
         {
-            Pattern = pattern;
+            RegexPattern = regexPattern;
             Color = color;
             OnClick = onClick;
         }
@@ -44,13 +44,13 @@ public void SetClickableByRegex(string regexPattern, Color color, Action<string>
             return;
         }
 
-        _regexEntryTable[regexPattern] = new RegexEntry(regexPattern, color, onClick);
+        _entryTable[regexPattern] = new Entry(regexPattern, color, onClick);
     }
 
     public override void RemoveClickable()
     {
         base.RemoveClickable();
-        _regexEntryTable.Clear();
+        _entryTable.Clear();
     }
 
     /// <summary>
@@ -59,11 +59,11 @@ public override void RemoveClickable()
     /// </summary>
     protected override void RegisterClickable()
     {
-        foreach (var regexEntry in _regexEntryTable.Values)
+        foreach (var entry in _entryTable.Values)
         {
-            foreach (Match m in Regex.Matches(text, regexEntry.Pattern))
+            foreach (Match match in Regex.Matches(text, entry.RegexPattern))
             {
-                RegisterClickable(m.Index, m.Value.Length, regexEntry.Color, regexEntry.OnClick);
+                RegisterClickable(match.Index, match.Value.Length, entry.Color, entry.OnClick);
             }
         }
     }

Assets/Hypertext/Scripts/HypertextBase.cs

@@ -107,9 +107,9 @@ void Modify(ref List<UIVertex> vertices)
 
                 for (int vertexIndex = 0; vertexIndex < CharVertsNum; vertexIndex++)
                 {
-                    var uiVertex = vertices[vertexStartIndex + vertexIndex];
-                    uiVertex.color = entry.Color;
-                    vertices[vertexStartIndex + vertexIndex] = uiVertex;
+                    var vertex = vertices[vertexStartIndex + vertexIndex];
+                    vertex.color = entry.Color;
+                    vertices[vertexStartIndex + vertexIndex] = vertex;
 
                     var pos = vertices[vertexStartIndex + vertexIndex].position;
 
@@ -134,17 +134,17 @@ void Modify(ref List<UIVertex> vertices)
                     }
                 }
 
-                var rect = new Rect();
-                rect.min = min;
-                rect.max = max;
-                entry.Rects.Add(rect);
+                var charRect = new Rect();
+                charRect.min = min;
+                charRect.max = max;
+                entry.Rects.Add(charRect);
             }
 
             // 同じ行で隣り合った矩形をまとめる
             var mergedRects = new List<Rect>();
-            foreach (var rowRects in SplitRectsByRow(entry.Rects))
+            foreach (var charRects in SplitRectsByRow(entry.Rects))
             {
-                mergedRects.Add(MergeRects(rowRects));
+                mergedRects.Add(MergeRects(charRects));
             }
 
             entry.Rects = mergedRects;

Assets/Hypertext/Scripts/ObjectPool.cs

@@ -7,17 +7,17 @@ namespace HypertextHelper
     public class ObjectPool<T> where T : new()
     {
         readonly Stack<T> _stack = new Stack<T>();
-        readonly UnityAction<T> _actionOnGet;
-        readonly UnityAction<T> _actionOnRelease;
+        readonly UnityAction<T> _onGet;
+        readonly UnityAction<T> _onRelease;
 
         public int CountAll { get; set; }
         public int CountActive { get { return CountAll - CountInactive; } }
         public int CountInactive { get { return _stack.Count; } }
 
-        public ObjectPool(UnityAction<T> actionOnGet, UnityAction<T> actionOnRelease)
+        public ObjectPool(UnityAction<T> onGet, UnityAction<T> onRelease)
         {
-            _actionOnGet = actionOnGet;
-            _actionOnRelease = actionOnRelease;
+            _onGet = onGet;
+            _onRelease = onRelease;
         }
 
         public T Get()
@@ -33,9 +33,9 @@ public T Get()
                 element = _stack.Pop();
             }
 
-            if (_actionOnGet != null)
+            if (_onGet != null)
             {
-                _actionOnGet(element);
+                _onGet(element);
             }
 
             return element;
@@ -48,12 +48,12 @@ public void Release(T element)
                 Debug.LogError("Internal error. Trying to destroy object that is already released to pool.");
             }
 
-            if (_actionOnRelease != null)
+            if (_onRelease != null)
             {
-                _actionOnRelease(element);
+                _onRelease(element);
             }
 
             _stack.Push(element);
         }
     }
-}
+}