operator: add operators for accessing end: field

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
universal-ctags · May 2, 2021 · c19ead2 · c19ead2
1 parent faa5197
commit c19ead2
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 6 deletions.
diff --git a/Tmain/list-fields-fixed-field-handling.d/stdout-expected.txt b/Tmain/list-fields-fixed-field-handling.d/stdout-expected.txt
@@ -11,7 +11,7 @@ S       signature      no      NONE             s--    no    rw Signature of rou
 T       epoch          no      NONE             -i-    no    -- the last modified time of the input file (only for F/file kind tag)
 Z       scope          no      NONE             s--    no    rw [tags output] prepend "scope:" key to s/scope field output, [xref and json output] the same as s/ field
 a       access         no      NONE             s--    no    -- Access (or export) of class members
-e       end            no      NONE             -i-    no    -- end lines of various items
+e       end            no      NONE             -i-    no    rw end lines of various items
 f       file           no      NONE             --b    no    -- File-restricted scoping
 i       inherits       no      NONE             s-b    no    -- Inheritance information
 k       NONE           no      NONE             s--    no    -- Kind of tag in one-letter form
@@ -37,7 +37,7 @@ S       signature      no      NONE             s--    no    rw Signature of rou
 T       epoch          no      NONE             -i-    no    -- the last modified time of the input file (only for F/file kind tag)
 Z       scope          no      NONE             s--    no    rw [tags output] prepend "scope:" key to s/scope field output, [xref and json output] the same as s/ field
 a       access         no      NONE             s--    no    -- Access (or export) of class members
-e       end            no      NONE             -i-    no    -- end lines of various items
+e       end            no      NONE             -i-    no    rw end lines of various items
 f       file           no      NONE             --b    no    -- File-restricted scoping
 i       inherits       no      NONE             s-b    no    -- Inheritance information
 k       NONE           no      NONE             s--    no    -- Kind of tag in one-letter form
@@ -63,7 +63,7 @@ S       signature      no      NONE             s--    no    rw Signature of rou
 T       epoch          no      NONE             -i-    no    -- the last modified time of the input file (only for F/file kind tag)
 Z       scope          no      NONE             s--    no    rw [tags output] prepend "scope:" key to s/scope field output, [xref and json output] the same as s/ field
 a       access         no      NONE             s--    no    -- Access (or export) of class members
-e       end            no      NONE             -i-    no    -- end lines of various items
+e       end            no      NONE             -i-    no    rw end lines of various items
 f       file           no      NONE             --b    no    -- File-restricted scoping
 i       inherits       no      NONE             s-b    no    -- Inheritance information
 k       NONE           no      NONE             s--    no    -- Kind of tag in one-letter form
@@ -89,7 +89,7 @@ S       signature      no      NONE             s--    no    rw Signature of rou
 T       epoch          no      NONE             -i-    no    -- the last modified time of the input file (only for F/file kind tag)
 Z       scope          no      NONE             s--    no    rw [tags output] prepend "scope:" key to s/scope field output, [xref and json output] the same as s/ field
 a       access         no      NONE             s--    no    -- Access (or export) of class members
-e       end            no      NONE             -i-    no    -- end lines of various items
+e       end            no      NONE             -i-    no    rw end lines of various items
 f       file           no      NONE             --b    no    -- File-restricted scoping
 i       inherits       no      NONE             s-b    no    -- Inheritance information
 k       NONE           no      NONE             s--    no    -- Kind of tag in one-letter form

diff --git a/Tmain/list-fields-with-prefix.d/stdout-expected.txt b/Tmain/list-fields-with-prefix.d/stdout-expected.txt
@@ -1,7 +1,7 @@
 E       UCTAGSextras         no      NONE             s--    no    r- Extra tag type information
 T       UCTAGSepoch          yes     NONE             -i-    no    -- the last modified time of the input file (only for F/file kind tag)
 Z       UCTAGSscope          no      NONE             s--    no    rw [tags output] prepend "scope:" key to s/scope field output, [xref and json output] the same as s/ field
-e       UCTAGSend            no      NONE             -i-    no    -- end lines of various items
+e       UCTAGSend            no      NONE             -i-    no    rw end lines of various items
 p       UCTAGSscopeKind      no      NONE             s--    no    -- [tags output] no effect, [xref and json output] kind of scope in long-name form
 r       UCTAGSroles          no      NONE             s--    no    r- Roles
 x       UCTAGSxpath          no      NONE             s--    no    -- xpath for the tag

diff --git a/Tmain/list-fields.d/stdout-expected.txt b/Tmain/list-fields.d/stdout-expected.txt
@@ -10,7 +10,7 @@ S	signature	no	NONE	s--	no	rw	Signature of routine (e.g. prototype or parameter
 T	epoch	yes	NONE	-i-	no	--	the last modified time of the input file (only for F/file kind tag)
 Z	scope	no	NONE	s--	no	rw	[tags output] prepend "scope:" key to s/scope field output, [xref and json output] the same as s/ field
 a	access	no	NONE	s--	no	--	Access (or export) of class members
-e	end	no	NONE	-i-	no	--	end lines of various items
+e	end	no	NONE	-i-	no	rw	end lines of various items
 f	file	yes	NONE	--b	no	--	File-restricted scoping
 i	inherits	no	NONE	s-b	no	--	Inheritance information
 k	NONE	yes	NONE	s--	no	--	Kind of tag in one-letter form

diff --git a/Units/optscript.r/op-end.d/args.ctags b/Units/optscript.r/op-end.d/args.ctags
@@ -0,0 +1,17 @@
+--fields=+en
+
+--langdef=X
+--map-X=.unknown
+--kinddef-X=d,def,definitions
+
+--regex-X=/[ \t]*def ([a-z])/\1/d/{exclusive}{{
+	. _scopetop { scope: } if
+    . _scopeset
+}}
+
+--regex-X=/[ \t]*(end)//{{
+	_scopetop {
+        1 _matchloc end:
+        _scopepop
+    } if
+}}
diff --git a/Units/optscript.r/op-end.d/expected.tags b/Units/optscript.r/op-end.d/expected.tags
@@ -0,0 +1,4 @@
+a	input.unknown	/^def a$/;"	d	line:1	end:9
+b	input.unknown	/^    def b$/;"	d	line:2	def:a	end:4
+c	input.unknown	/^    def c$/;"	d	line:5	def:a	end:8
+d	input.unknown	/^     	def d$/;"	d	line:6	def:a.c	end:7
diff --git a/Units/optscript.r/op-end.d/input.unknown b/Units/optscript.r/op-end.d/input.unknown
@@ -0,0 +1,11 @@
+def a
+    def b
+    	...
+    end
+    def c
+     	def d
+	end
+    end
+end
+
+end
diff --git a/main/field.c b/main/field.c
@@ -100,6 +100,9 @@ static EsObject* getFieldValueForExtras (const tagEntryInfo *, const fieldDefini
 static EsObject* getFieldValueForSignature (const tagEntryInfo *, const fieldDefinition *);
 static EsObject* setFieldValueForSignature (tagEntryInfo *, const fieldDefinition *, const EsObject *);
 static EsObject* getFieldValueForRoles (const tagEntryInfo *, const fieldDefinition *);
+static EsObject* getFieldValueForEnd (const tagEntryInfo *, const fieldDefinition *);
+static EsObject* checkFieldValueForEnd (const fieldDefinition *, const EsObject *);
+static EsObject* setFieldValueForEnd (tagEntryInfo *, const fieldDefinition *, const EsObject *);
 
 #define WITH_DEFUALT_VALUE(str) ((str)?(str):FIELD_NULL_LETTER_STRING)
 
@@ -401,6 +404,12 @@ static fieldDefinition fieldDefinitionsUniversal [] = {
 		.doesContainAnyChar = NULL,
 		.isValueAvailable	= isEndFieldAvailable,
 		.dataType			= FIELDTYPE_INTEGER,
+		.getterValueType    = "int",
+		.getValueObject     = getFieldValueForEnd,
+		.setterValueType    = "matchlok|int",
+		.checkValueForSetter= checkFieldValueForEnd,
+		.setValueObject     = setFieldValueForEnd,
+
 	},
 	[FIELD_EPOCH - FIELD_ROLES] = {
 		.letter				= 'T',
@@ -1720,3 +1729,36 @@ static EsObject* getFieldValueForRoles (const tagEntryInfo *tag, const fieldDefi
 	}
 	return a;
 }
+
+static EsObject* getFieldValueForEnd (const tagEntryInfo *tag, const fieldDefinition *fdef)
+{
+	return ((int)tag->extensionFields.endLine == 0)
+		? es_nil
+		: es_integer_new ((int)tag->extensionFields.endLine);
+}
+
+static EsObject* checkFieldValueForEnd (const fieldDefinition *fdef, const EsObject *obj)
+{
+	return es_false;
+}
+
+static EsObject* setFieldValueForEnd (tagEntryInfo *tag, const fieldDefinition *fdef, const EsObject *obj)
+{
+	int l;
+	if (es_object_get_type (obj) == OPT_TYPE_MATCHLOC)
+	{
+		matchLoc *loc = es_pointer_get (obj);
+		l = loc->line;
+	}
+	else if (es_integer_p (obj))
+	{
+		l = es_integer_get (obj);
+		if (l < 1)
+			return OPT_ERR_RANGECHECK;
+	}
+	else
+		return OPT_ERR_TYPECHECK;
+
+	tag->extensionFields.endLine = l;
+	return es_false;
+}
-Original file line number
+Diff line change
@@ -0,0 +1,11 @@
+    def a
+        def b
+        	...
+        end
+        def c
+         	def d
+    	end
+        end
+    end
+    end