basic: add more advanced extraction of dim-like variables

Author: techee

Units/parser-basic.r/simple.bas.d/expected.tags

@@ -1,6 +1,12 @@
 a	input.bas	/^Common a As Integer$/;"	v
 b	input.bas	/^Dim b As Integer$/;"	v
+c	input.bas	/^dim as string c(20), d="a", e$/;"	v
+d	input.bas	/^dim as string c(20), d="a", e$/;"	v
+e	input.bas	/^dim as string c(20), d="a", e$/;"	v
 f	input.bas	/^Function f()$/;"	f
+g	input.bas	/^dim shared as string g$/;"	v
+h	input.bas	/^dim as string ptr h$/;"	v
+i	input.bas	/^dim as string * 4096 i$/;"	v
 one	input.bas	/^Const one = 1$/;"	c
 start	input.bas	/^start:$/;"	l
 str	input.bas	/^DIM AS STRING str$/;"	v

Units/parser-basic.r/simple.bas.d/input.bas

@@ -5,6 +5,10 @@ Const one = 1
 Common a As Integer
 Dim b As Integer
 DIM AS STRING str
+dim as string c(20), d="a", e
+dim shared as string g
+dim as string ptr h
+dim as string * 4096 i
 
 Type test
     a As Integer

parsers/basic.c

@@ -52,7 +52,6 @@ static kindDefinition BasicKinds[] = {
 static KeyWord basic_keywords[] = {
 	/* freebasic */
 	{"const", K_CONST, 0},
-	{"dim as", K_VARIABLE, 1},
 	{"dim", K_VARIABLE, 0},
 	{"common", K_VARIABLE, 0},
 	{"function", K_FUNCTION, 0},
@@ -83,6 +82,74 @@ static KeyWord basic_keywords[] = {
  *   FUNCTION DEFINITIONS
  */
 
+/* Match the name of a dim or const starting at pos. */
+static void extract_dim (char const *pos, BasicKind kind)
+{
+	vString *name = vStringNew ();
+
+	if (strncasecmp (pos, "shared", 6) == 0)
+		pos += 6; /* skip keyword "shared" */
+
+	while (isspace (*pos))
+		pos++;
+
+	/* capture "dim as String str" */
+	if (strncasecmp (pos, "as", 2) == 0)
+	{
+			pos += 2; /* skip keyword "as" */
+
+		while (isspace (*pos))
+			pos++;
+		while (!isspace (*pos) && *pos) /* skip next part which is a type */
+			pos++;
+		while (isspace (*pos))
+			pos++;
+		/* now we are at the name */
+	}
+	/* capture "dim as foo ptr bar" */
+	if (strncasecmp (pos, "ptr", 3) == 0 && isspace(*(pos+3)))
+	{
+		pos += 3; /* skip keyword "ptr" */
+		while (isspace (*pos))
+			pos++;
+	}
+	/*	capture "dim as string * 4096 chunk" */
+	if (strncmp (pos, "*", 1) == 0)
+	{
+		pos += 1; /* skip "*" */
+		while (isspace (*pos) || isdigit(*pos) || ispunct(*pos))
+			pos++;
+	}
+
+	for (; *pos && !isspace (*pos) && *pos != '(' && *pos != ',' && *pos != '='; pos++)
+		vStringPut (name, *pos);
+	makeSimpleTag (name, kind);
+
+	/* if the line contains a ',', we have multiple declarations */
+	while (*pos && strchr (pos, ','))
+	{
+		/* skip all we don't need(e.g. "..., new_array(5), " we skip "(5)") */
+		while (*pos != ',' && *pos != '\'' && *pos)
+			pos++;
+
+		if (*pos == '\'')
+			break; /* break if we are in a comment */
+
+		while (isspace (*pos) || *pos == ',')
+			pos++;
+
+		if (*pos == '\'')
+			break; /* break if we are in a comment */
+
+		vStringClear (name);
+		for (; *pos && !isspace (*pos) && *pos != '(' && *pos != ',' && *pos != '='; pos++)
+			vStringPut (name, *pos);
+		makeSimpleTag (name, kind);
+	}
+
+	vStringDelete (name);
+}
+
 /* Match the name of a tag (function, variable, type, ...) starting at pos. */
 static char const *extract_name (char const *pos, vString * name)
 {
@@ -116,6 +183,12 @@ static int match_keyword (const char *p, KeyWord const *kw)
 	if (old_p == p)
 		return 0;
 
+	if (kw->kind == K_VARIABLE)
+	{
+		extract_dim (p, kw->kind); /* extract_dim adds the found tag(s) */
+		return 1;
+	}
+
 	name = vStringNew ();
 	for (j = 0; j < 1 + kw->skip; j++)
 	{