Merge pull request #3198 from masatake/elixir-minor-revise

masatake · web-flow · commit 1d9e6fe319de · 2021-11-29T22:06:50.000+09:00
Elixir minor revise (including SELF-INCOMPATIBLE change)
diff --git a/Tmain/list-fields-fixed-field-handling.d/stdout-expected.txt b/Tmain/list-fields-fixed-field-handling.d/stdout-expected.txt
@@ -10,7 +10,7 @@ R       NONE           no      NONE             s--    no    -- Marker (R or D)
 S       signature      no      NONE             s--    no    rw Signature of routine (e.g. prototype or parameter list)
 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
+a       access         no      NONE             s--    no    rw Access (or export) of class members
 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    -w Inheritance information
@@ -37,7 +37,7 @@ R       NONE           no      NONE             s--    no    -- Marker (R or D)
 S       signature      no      NONE             s--    no    rw Signature of routine (e.g. prototype or parameter list)
 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
+a       access         no      NONE             s--    no    rw Access (or export) of class members
 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    -w Inheritance information
@@ -64,7 +64,7 @@ R       NONE           no      NONE             s--    no    -- Marker (R or D)
 S       signature      no      NONE             s--    no    rw Signature of routine (e.g. prototype or parameter list)
 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
+a       access         no      NONE             s--    no    rw Access (or export) of class members
 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    -w Inheritance information
@@ -91,7 +91,7 @@ R       NONE           no      NONE             s--    no    -- Marker (R or D)
 S       signature      no      NONE             s--    no    rw Signature of routine (e.g. prototype or parameter list)
 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
+a       access         no      NONE             s--    no    rw Access (or export) of class members
 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    -w Inheritance information
diff --git a/Tmain/list-fields-with-prefix.d/stdout-expected.txt b/Tmain/list-fields-with-prefix.d/stdout-expected.txt
@@ -18,7 +18,6 @@ x       UCTAGSxpath          no      NONE             s--    no    -- xpath for
 -       UCTAGSmacrodef       no      CPreProcessor    s--    no    -- macro definition
 -       UCTAGSmacrodef       no      CUDA             s--    no    -- macro definition
 -       UCTAGSproperties     no      CUDA             s--    no    -- properties (static, inline, mutable,...)
--       UCTAGSaccess         yes     Elixir           s--    no    -- access
 -       UCTAGShowImported    no      Go               s--    no    -- how the package is imported ("inline" for `.' or "init" for `_')
 -       UCTAGSpackage        yes     Go               s--    no    -- the real package specified by the package name
 -       UCTAGSpackageName    yes     Go               s--    no    -- the name for referring the package
diff --git a/Tmain/list-fields.d/stdout-expected.txt b/Tmain/list-fields.d/stdout-expected.txt
@@ -9,7 +9,7 @@ R	NONE	no	NONE	s--	no	--	Marker (R or D) representing whether tag is definition
 S	signature	no	NONE	s--	no	rw	Signature of routine (e.g. prototype or parameter list)
 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
+a	access	no	NONE	s--	no	rw	Access (or export) of class members
 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	-w	Inheritance information
@@ -36,7 +36,6 @@ z	kind	no	NONE	s--	no	r-	[tags output] prepend "kind:" to k/ (or K/) field outpu
 -	macrodef	no	CPreProcessor	s--	no	--	macro definition
 -	macrodef	no	CUDA	s--	no	--	macro definition
 -	properties	no	CUDA	s--	no	--	properties (static, inline, mutable,...)
--	access	yes	Elixir	s--	no	--	access
 -	howImported	no	Go	s--	no	--	how the package is imported ("inline" for `.' or "init" for `_')
 -	package	yes	Go	s--	no	--	the real package specified by the package name
 -	packageName	yes	Go	s--	no	--	the name for referring the package
diff --git a/Tmain/optscript.d/error-undefined-if-if.expected b/Tmain/optscript.d/error-undefined-if-if.expected
@@ -4,4 +4,4 @@ top|   |bottom
 Execution stack:
 top|   a   {a}   --if--   {true {a} if}   --if--   |bottom
 Dictionary stack:
-top|   -dict:1-   -dict:87-   |bottom
+top|   -dict:1-   -dict:88-   |bottom
diff --git a/Tmain/optscript.d/error-undefined-if.expected b/Tmain/optscript.d/error-undefined-if.expected
@@ -4,4 +4,4 @@ top|   |bottom
 Execution stack:
 top|   a   {a}   --if--   |bottom
 Dictionary stack:
-top|   -dict:1-   -dict:87-   |bottom
+top|   -dict:1-   -dict:88-   |bottom
diff --git a/Tmain/optscript.d/typeattrconv.expected b/Tmain/optscript.d/typeattrconv.expected
@@ -21,3 +21,13 @@ dicttype
 {add}
 arraytype
 /xyz
+(abc)
+(efg)
+(true)
+(false)
+(99)
+(-309)
+(--nulltype--)
+(--arraytype--)
+(--dicttype--)
+(--arraytype--)
diff --git a/Tmain/optscript.d/typeattrconv.ps b/Tmain/optscript.d/typeattrconv.ps
diff --git a/Units/optscript.r/op-access.d/args.ctags b/Units/optscript.r/op-access.d/args.ctags
@@ -0,0 +1,15 @@
+--sort=no
+--langdef=X
+--map-X=.unknown
+--kinddef-X=v,var,variables
+--fields=+{access}
+--regex-X=/^(pub|priv) +var +([a-z]+)$/\2/v/{{
+    . \1 (pub) eq {(public)}{(private)} ifelse access:
+    mark . :access {
+      0 string cvs
+      (-) \2 _buildstring
+      /var _tag _commit pop
+    } {
+      cleartomark
+    } ifelse
+}}
diff --git a/Units/optscript.r/op-access.d/expected.tags b/Units/optscript.r/op-access.d/expected.tags
@@ -0,0 +1,4 @@
+x	input.unknown	/^pub var x$/;"	v	access:public
+public-x	input.unknown	/^pub var x$/;"	v
+y	input.unknown	/^priv var y$/;"	v	access:private
+private-y	input.unknown	/^priv var y$/;"	v
diff --git a/Units/optscript.r/op-access.d/input.unknown b/Units/optscript.r/op-access.d/input.unknown
@@ -0,0 +1,2 @@
+pub var x
+priv var y
diff --git a/Units/parser-elixir.r/elixir-callbacks.d/args.ctags b/Units/parser-elixir.r/elixir-callbacks.d/args.ctags
@@ -1,2 +1,2 @@
 --sort=no
---fields=+K
+--fields=+Ka
diff --git a/Units/parser-elixir.r/elixir-exceptions.b/README.md b/Units/parser-elixir.r/elixir-exceptions.b/README.md
diff --git a/Units/parser-elixir.r/elixir-exceptions.b/expected.tags b/Units/parser-elixir.r/elixir-exceptions.b/expected.tags
diff --git a/Units/parser-elixir.r/elixir-exceptions.d/args.ctags b/Units/parser-elixir.r/elixir-exceptions.d/args.ctags
@@ -0,0 +1,2 @@
+--sort=no
+--fields=+Ka
diff --git a/Units/parser-elixir.r/elixir-exceptions.d/expected.tags b/Units/parser-elixir.r/elixir-exceptions.d/expected.tags
@@ -0,0 +1,3 @@
+ModuleError	input.ex	/^defmodule ModuleError do$/;"	module
+ModuleError	input.ex	/^  defexception [:message]$/;"	exception	module:ModuleError
+exception	input.ex	/^  def exception(value) do$/;"	function	module:ModuleError	access:public
diff --git a/Units/parser-elixir.r/elixir-exceptions.d/input.ex b/Units/parser-elixir.r/elixir-exceptions.d/input.ex
@@ -1,9 +1,9 @@
-defmodule ErrorModule do
+defmodule ModuleError do
   defexception [:message]
 
   @impl true
   def exception(value) do
     msg = "did not get what was expected, got: #{inspect(value)}"
-    %ErrorModule{message: msg}
+    %ModuleError{message: msg}
   end
 end
diff --git a/Units/parser-elixir.r/elixir-functions.d/args.ctags b/Units/parser-elixir.r/elixir-functions.d/args.ctags
@@ -1,2 +1,2 @@
 --sort=no
---fields=+K
+--fields=+Ka
diff --git a/Units/parser-elixir.r/elixir-macros.d/args.ctags b/Units/parser-elixir.r/elixir-macros.d/args.ctags
@@ -1,2 +1,2 @@
 --sort=no
---fields=+K
+--fields=+Ka
diff --git a/Units/parser-elixir.r/elixir-modules.d/args.ctags b/Units/parser-elixir.r/elixir-modules.d/args.ctags
@@ -1,2 +1,2 @@
 --sort=no
---fields=+K
+--fields=+Ka
diff --git a/Units/parser-elixir.r/elixir-records.d/args.ctags b/Units/parser-elixir.r/elixir-records.d/args.ctags
@@ -1,2 +1,2 @@
 --sort=no
---fields=+K
+--fields=+Ka
diff --git a/Units/parser-elixir.r/elixir-sign-operators.d/args.ctags b/Units/parser-elixir.r/elixir-sign-operators.d/args.ctags
@@ -1,2 +1,2 @@
 --sort=no
---fields=+K
+--fields=+Ka
diff --git a/Units/parser-elixir.r/elixir-simple.d/args.ctags b/Units/parser-elixir.r/elixir-simple.d/args.ctags
@@ -1,2 +1,2 @@
 --sort=no
---fields=+K
+--fields=+Ka
diff --git a/Units/parser-elixir.r/elixir-tests.d/args.ctags b/Units/parser-elixir.r/elixir-tests.d/args.ctags
@@ -1,2 +1,2 @@
 --sort=no
---fields=+K
+--fields=+Ka
diff --git a/Units/parser-elixir.r/elixir-types.d/args.ctags b/Units/parser-elixir.r/elixir-types.d/args.ctags
@@ -1,2 +1,2 @@
 --sort=no
---fields=+K
+--fields=+Ka
diff --git a/Units/parser-elixir.r/elixir-word-operators.d/args.ctags b/Units/parser-elixir.r/elixir-word-operators.d/args.ctags
@@ -1,2 +1,2 @@
 --sort=no
---fields=+K
+--fields=+Ka
diff --git a/dsl/optscript.c b/dsl/optscript.c
@@ -374,6 +374,8 @@ declop(execstack);
  * tested in typeattrconv.ps */
 declop(type);
 declop(cvn);
+declop(cvs);
+
 /* cvlit, cvx, xcheck, executeonly, noacess, readonly,
    rcheck, wcheck, cvi, cvr, cvrs, cvs,... */
 
@@ -567,6 +569,7 @@ opt_init (void)
 
 	defop (opt_system_dict, type,   1, "any TYPE name");
 	defop (opt_system_dict, cvn,    1, "string CVN name");
+	defop (opt_system_dict, cvs,    2, "any string CVS string");
 
 	defop (opt_system_dict, null,   0, "- NULL null");
 	defop (opt_system_dict, bind,   1, "proc BIND proc");
@@ -3812,10 +3815,9 @@ op_for (OptVM *vm, EsObject *name)
 /*
  * Operators for type, attribute and their conversion
  */
-static EsObject*
-op_type (OptVM *vm, EsObject *name)
+static const char*
+get_type_name (EsObject *o)
 {
-	EsObject *o = ptrArrayRemoveLast (vm->ostack);
 	const char *n;
 
 	if (o == es_nil)
@@ -3830,6 +3832,17 @@ op_type (OptVM *vm, EsObject *name)
 		n = es_type_get_name (t);
 	}
 
+	return n;
+}
+
+static EsObject*
+op_type (OptVM *vm, EsObject *name)
+{
+	EsObject *o = ptrArrayRemoveLast (vm->ostack);
+	const char *n;
+
+	n = get_type_name (o);
+
 	EsObject *p = name_newS (n, ATTR_EXECUTABLE|ATTR_READABLE);
 	vm_ostack_push (vm, p);
 	es_object_unref (p);
@@ -3854,6 +3867,57 @@ op_cvn (OptVM *vm, EsObject *name)
 	return es_false;
 }
 
+static EsObject *
+op_cvs (OptVM *vm, EsObject *name)
+{
+	EsObject *o = ptrArrayLast (vm->ostack);
+	if (es_object_get_type (o) != OPT_TYPE_STRING)
+		return OPT_ERR_TYPECHECK;
+
+	EsObject *any = ptrArrayItemFromLast (vm->ostack, 1);
+	vString *vstr = es_pointer_get (o);
+	int t = es_object_get_type (any);
+
+	if (t == OPT_TYPE_STRING)
+	{
+		vString *vany = es_pointer_get (any);
+		vStringCopy (vstr, vany);
+	}
+	else if (t == OPT_TYPE_NAME || t == ES_TYPE_SYMBOL)
+	{
+		if (t == OPT_TYPE_NAME)
+			any = es_pointer_get (any);
+
+		const char *cany = es_symbol_get (any);
+		vStringCopyS (vstr, cany);
+	}
+	else if (t == ES_TYPE_INTEGER)
+	{
+		int iany = es_integer_get (any);
+#define buf_len 13
+		char buf[buf_len];
+		if (!(snprintf (buf, buf_len, "%d", iany) > 0))
+			buf [0] = '\0';
+		vStringCopyS (vstr, buf);
+	}
+	else if (t == ES_TYPE_BOOLEAN)
+		vStringCopyS (vstr, any == es_true? "true": "false");
+	else
+	{
+		const char *type_name = get_type_name (any);
+		vStringCopyS (vstr, "--");
+		vStringCatS (vstr, type_name);
+		vStringCatS (vstr, "--");
+	}
+
+	es_object_ref (o);
+	ptrArrayDeleteLastInBatch (vm->ostack, 2);
+	vm_ostack_push (vm, o);
+	es_object_unref (o);
+
+	return es_false;
+}
+
 
 /*
  * Misc operators
diff --git a/main/field.c b/main/field.c
@@ -100,6 +100,8 @@ static EsObject* getFieldValueForScope (const tagEntryInfo *, const fieldDefinit
 static EsObject* setFieldValueForScope (tagEntryInfo *, const fieldDefinition *, const EsObject *);
 static EsObject* checkFieldValueForScope (const fieldDefinition *, const EsObject *);
 static EsObject* getFieldValueForExtras (const tagEntryInfo *, const fieldDefinition *);
+static EsObject* getFieldValueForAccess (const tagEntryInfo *, const fieldDefinition *);
+static EsObject* setFieldValueForAccess (tagEntryInfo *, const fieldDefinition *, const EsObject *);
 static EsObject* getFieldValueForSignature (const tagEntryInfo *, const fieldDefinition *);
 static EsObject* setFieldValueForSignature (tagEntryInfo *, const fieldDefinition *, const EsObject *);
 static EsObject* getFieldValueForRoles (const tagEntryInfo *, const fieldDefinition *);
@@ -298,6 +300,11 @@ static fieldDefinition fieldDefinitionsExuberant [] = {
 		.doesContainAnyChar = NULL,
 		.isValueAvailable   = isAccessFieldAvailable,
 		.dataType           = FIELDTYPE_STRING,
+		.getterValueType    = NULL,
+		.getValueObject     = getFieldValueForAccess,
+		.setterValueType    = NULL,
+		.checkValueForSetter= NULL,
+		.setValueObject     = setFieldValueForAccess,
 	},
 	[FIELD_IMPLEMENTATION - FIELD_ECTAGS_START] = {
 		.letter             = 'm',
@@ -1777,23 +1784,43 @@ static EsObject* getFieldValueForExtras (const tagEntryInfo *tag, const fieldDef
 	return a;
 }
 
-static EsObject* getFieldValueForSignature (const tagEntryInfo *tag, const fieldDefinition *fdef)
+static EsObject* getFieldValueForCOMMON (const char *field, const tagEntryInfo *tag, const fieldDefinition *fdef)
 {
-	if (!tag->extensionFields.signature)
+	if (!field)
 		return es_nil;
-	return (opt_name_new_from_cstr (tag->extensionFields.signature));
+	return (opt_name_new_from_cstr (field));
 }
 
-static EsObject* setFieldValueForSignature (tagEntryInfo *tag, const fieldDefinition *fdef, const EsObject *obj)
+static EsObject* setFieldValueForCOMMON (const char **field, tagEntryInfo *tag, const fieldDefinition *fdef, const EsObject *obj)
 {
-	if (tag->extensionFields.signature)
-		eFree ((char *)tag->extensionFields.signature);
+	if (*field)
+		eFree ((char *)*field);
 
 	const char *str = opt_string_get_cstr (obj);
-	tag->extensionFields.signature = eStrdup (str);
+	*field = eStrdup (str);
 	return es_false;
 }
 
+static EsObject* getFieldValueForAccess (const tagEntryInfo *tag, const fieldDefinition *fdef)
+{
+	return getFieldValueForCOMMON(tag->extensionFields.access, tag, fdef);
+}
+
+static EsObject* setFieldValueForAccess (tagEntryInfo *tag, const fieldDefinition *fdef, const EsObject *obj)
+{
+	return setFieldValueForCOMMON(&tag->extensionFields.access, tag, fdef, obj);
+}
+
+static EsObject* getFieldValueForSignature (const tagEntryInfo *tag, const fieldDefinition *fdef)
+{
+	return getFieldValueForCOMMON(tag->extensionFields.signature, tag, fdef);
+}
+
+static EsObject* setFieldValueForSignature (tagEntryInfo *tag, const fieldDefinition *fdef, const EsObject *obj)
+{
+	return setFieldValueForCOMMON(&tag->extensionFields.signature, tag, fdef, obj);
+}
+
 static void makeRolesArray (const tagEntryInfo *const tag, int roleIndex, void *data)
 {
 	EsObject *a = data;
diff --git a/optlib/elixir.c b/optlib/elixir.c
diff --git a/optlib/elixir.ctags b/optlib/elixir.ctags
