Changeset 38

Timestamp:

Jun 4, 2014, 1:33:50 PM (7 years ago)

Author:

vadim.godunko

Message:

Rename members and parameter to reflect change in semantic.

Location:

trunk/forge/source/wiki

Files:

• forge-wiki-parsers.adb (modified) (5 diffs)
• forge-wiki-parsers.ads (modified) (3 diffs)

trunk/forge/source/wiki/forge-wiki-parsers.adb

@@ -74 +74 @@
       Total_Groups  : Positive;
       Markup_Group  : Natural;
-      Offset_Group  : Positive;
+      Text_Group    : Positive;
       Parser_Tag    : Ada.Tags.Tag;
    end record;
@@ -152 +152 @@
               (if Block.Markup_Group = 0 then 0
                  else Group + Block.Markup_Group),
-            Offset_Group => Group + Block.Offset_Group,
+            Text_Group   => Group + Block.Text_Group,
             Is_Start     => Is_Start,
             Parser_Tag   => Block.Parser_Tag));
@@ -215 +215 @@
                  <= Match.Last_Index (Item.Match_Group)
             then
-               Text_First := Match.First_Index (Item.Offset_Group);
-               Text_Last  := Match.Last_Index (Item.Offset_Group);
+               Text_First := Match.First_Index (Item.Text_Group);
+               Text_Last  := Match.Last_Index (Item.Text_Group);
 
                if Item.Is_Start
@@ -321 +321 @@
     (Regexp_String : League.Strings.Universal_String;
      Total_Groups  : Positive;
-     Offset_Group  : Positive;
+     Text_Group    : Positive;
      Tag           : Ada.Tags.Tag) is
    begin
-      Paragraph_Registry :=
-       (Regexp_String, Total_Groups, 0, Offset_Group, Tag);
+      Paragraph_Registry := (Regexp_String, Total_Groups, 0, Text_Group, Tag);
    end Register_Paragraph_Block_Parser;
 
@@ -336 +335 @@
      Total_Groups  : Positive;
      Markup_Group  : Natural;
-     Offset_Group  : Positive;
+     Text_Group    : Positive;
      Tag           : Ada.Tags.Tag) is
    begin
       Block_Registry.Append
-       ((Regexp_String, Total_Groups, Markup_Group, Offset_Group, Tag));
+       ((Regexp_String, Total_Groups, Markup_Group, Text_Group, Tag));
    end Register_Block_Parser;
 

trunk/forge/source/wiki/forge-wiki-parsers.ads

@@ -69 +69 @@
      Total_Groups  : Positive;
      Markup_Group  : Natural;
-     Offset_Group  : Positive;
+     Text_Group    : Positive;
      Tag           : Ada.Tags.Tag);
    --  Registers custom block parser. Regexp_String is regular expression to
-   --  detect start of custom block. Offset_Group is number of group in regular
+   --  detect start of custom block. Text_Group is number of group in regular
    --  expression which is used to detect position of first significant
    --  character of text on block's start line. Total_Groups is total number of
@@ -81 +81 @@
     (Regexp_String : League.Strings.Universal_String;
      Total_Groups  : Positive;
-     Offset_Group  : Positive;
+     Text_Group    : Positive;
      Tag           : Ada.Tags.Tag);
    --  Register custom block parser for base paragraph block. Only one parser
@@ -91 +91 @@
       Match_Group  : Positive;
       Markup_Group : Natural;
-      Offset_Group : Positive;
+      Text_Group   : Positive;
       --  Regular expression's groups to extract:
       --   - matching of block element's regular expression
       --   - markup part of block element (it is optional part)
-      --   - start of text after markup part
+      --   - text part of block element
       Is_Start     : Boolean;
       --  Regular expression detects start of new block element of this kind.