Merge pull request #1 from ghfbsd/master

Added ForTran 77 and R language definitions, with expanded capabilities and documentation to support them.

Author: rfritz

.gitignore

@@ -9,3 +9,7 @@ install_manifest.txt
 compile_commands.json
 CTestTestfile.cmake
 _deps
+*.o
+vgrind.sh
+vfontedpr
+Makefile

extern.h

@@ -50,6 +50,7 @@ extern char    *l_prcbeg;              /* regular expr for procedure begin */
 extern char    *l_strbeg;              /* delimiter for string constant */
 extern char    *l_strend;              /* delimiter for string constant */
 extern bool     l_toplex;              /* procedures only defined at top lex level */
+extern bool     l_dotaln;              /* dot is alphanumeric in this lang */
 extern const char *language;           /* the language indicator */
 
 #include <sys/cdefs.h>

regexp.c

@@ -467,8 +467,10 @@ expmatch(
 			/* not optional and we still matched */
 			return NULL;
 		    }
-		    if (!isalnum((unsigned char)*s1) && *s1 != '_')
-			return NULL;
+                    if (!isalnum((unsigned char)*s1)){
+                        if (!(*s1 == '_' || (l_dotaln && *s1 == '.')))
+			    return NULL;
+                    }
 		    if (*s1 == '\\')
 			x_escaped = x_escaped ? false : true;
 		    else

vfontedpr.c

@@ -97,7 +97,7 @@ static bool	pass = false;	/*
 
 static int	blklevel;	/* current nesting level */
 static int	comtype;	/* type of comment */
-static const char *defsfile[2] = { _PATH_VGRINDEFS, 0 };
+static char *defsfile[2] = { _PATH_VGRINDEFS, 0 };
 				/* name of language definitions file */
 static int	margin;
 static int	plstack[PSMAX];	/* the procedure nesting level stack */
@@ -124,6 +124,7 @@ char	*l_prcbeg;		/* regular expr for procedure begin */
 char    *l_strbeg;		/* delimiter for string constant */
 char    *l_strend;		/* delimiter for string constant */
 bool	 l_toplex;		/* procedures only defined at top lex level */
+bool     l_dotaln;              /* dot is alphanumeric in this lang */
 const char *language = "c";	/* the language indicator */
 
 #define	ps(x)	printf("%s", x)
@@ -280,6 +281,7 @@ main(int argc, char *argv[])
 	l_escape = '\\';
 	l_onecase = (cgetcap(defs, "oc", ':') != NULL);
 	l_toplex = (cgetcap(defs, "tl", ':') != NULL);
+        l_dotaln = (cgetcap(defs, "da", ':') != NULL);
 
 	/* initialize the program */
 
@@ -347,7 +349,7 @@ main(int argc, char *argv[])
     exit(0);
 }
 
-#define isidchr(c) (isalnum((unsigned char)(c)) || (c) == '_')
+#define isidchr(c) (isalnum((unsigned char)(c)) || (c) == '_' || (l_dotaln && (c) == '.'))
 
 static void
 putScp(char *os)
@@ -657,6 +659,9 @@ putcp(int c)
 		ps("\\fI\\h'\\w' 'u-\\w'/'u'/\\fP");
 		break;
 
+        case 015:      /* Ignore cr - most compilers don't care */
+                break;
+
 	default:
 		if (c < 040)
 			putchar('^'), c |= '@';

vgrind.1

@@ -92,6 +92,21 @@ There need be no particular ordering with
 .Xr eqn 1
 or
 .Xr tbl 1 .
+Function and procedure labels may be suppressed in filter mode by making the
+.Xr troff
+.Em y
+register nonzero; the lines
+.Bl -tag -width XXXXXXXXXX
+.It \&.vS
+starts processing
+.It \&.nr\ y\ 1
+suppress labeling
+.It ...
+program text
+.It \&.vE
+ends processing
+.El
+will achieve this.
 .Pp
 In regular mode
 .Nm
@@ -134,6 +149,10 @@ or the default),
 .Pq Fl l Ns Ar sh ,
 .Tn RATFOR
 .Pq Fl l Ns Ar r ,
+.Tn "Fortran 77"
+.Pq Fl l Ns Ar f77 ,
+.Tn R
+.Pq Fl l Ns Ar R ,
 .Tn MODULA2
 .Pq Fl l Ns Ar mod2 ,
 .Tn YACC
@@ -245,7 +264,9 @@ The mechanism of
 .Xr ctags 1
 in recognizing functions should be used here.
 .Pp
-Filter mode does not work in documents using the
+Filter mode must be the last option if used.
+.Pp
+Filter mode might interfere with formatting of documents using the
 .Fl me
 or
 .Fl ms

vgrind.tmac

@@ -53,7 +53,7 @@
 'ne 3
 ..
 'de FN
-\f2\s(14\h'\\n(.lu-\w'\\$1'u'\\$1\fP\s0\h'|0u'\c
+.if !\\ny \f2\s(14\h'\\n(.lu-\w'\\$1'u'\\$1\fP\s0\h'|0u'\c
 .if \\nx .tm \\$1 \\*(=F \\n%
 'ds =f \&...\\$1
 ..

vgrindefs.5

@@ -56,24 +56,27 @@ The following table names and describes each field.
 .It "be	str	regular expression for the end of a lexical block"
 .It "cb	str	regular expression for the start of a comment"
 .It "ce	str	regular expression for the end of a comment"
+.It "ab	str	regular expression for the alternate start of a comment"
+.It "ae	str	regular expression for the alternate end of a comment"
 .It "sb	str	regular expression for the start of a string"
 .It "se	str	regular expression for the end of a string"
 .It "lb	str	regular expression for the start of a character constant"
 .It "le	str	regular expression for the end of a character constant"
 .It "tl	bool	present means procedures are only defined at the top lexical level"
 .It "oc	bool	present means upper and lower case are equivalent"
+.It "da	bool	present means dot is considered alphanumeric in identifiers"
 .It "kw	str	a list of keywords separated by spaces"
 .El
 .Sh FILES
 .Bl -tag -width /usr/share/misc/vgrindefs -compact
-.It Pa /usr/share/misc/vgrindefs
+.It Pa $(PREFIX)/share/vgrind/vgrindefs
 File containing terminal descriptions.
 .El
 .Sh EXAMPLES
 The following entry, which describes the C language, is
 typical of a language entry.
 .Bd -literal
-C|c:\
+C|c:\e
 :pb=^\ed?*?\ed?\ep\ed?\e(\ea?\e):bb={:be=}:cb=/*:ce=*/:sb=":se=\ee":\e
 :lb=':le=\ee':tl:\e
 :kw=asm auto break case char continue default do double else enum\e

vgrindefs.src

@@ -37,7 +37,7 @@
 C|c:\
 	:pb=^\d?*?\d?\p\d?\(\a?\)(\d|{):bb={:be=}:cb=/*:ce=*/:sb=":se=\e":lb=':\
 	:le=\e':tl:\
-	:kw=asm auto break case char continue default do double else enum\
+	:kw=asm auto break case char const continue default do double else enum\
 	extern float for fortran goto if int long register return short\
 	sizeof static struct switch typedef union unsigned void while #define\
 	#else #endif #if #ifdef #ifndef #include #undef # define else endif\
@@ -146,3 +146,19 @@ C++|c++:\
 	ifdef ifndef include undef defined\
 	class const delete friend inline new operator overload private\
 	protected public virtual:
+f77|F77:\
+	:pb=(program|subroutine|function)\d\p\d?\(\a?\):\
+	:bb=(program|subroutine|function)\d\p\d?\(\a?\):be=^\d?end:\
+	:cb=^c:ce=$:\
+	:ab=^*:ae=$:\
+	:sb=("|'):se=(\e"|\e'):oc:\
+	:kw=character complex double integer implicit logical real precision \
+        external common \
+        call cycle exit data do else elseif end endif format function goto if \
+	include parameter pause print read return save stop subroutine then \
+        write:
+R:\
+	:pb=\p\d<-\d(function):bb={:be=}:\
+	:cb=#:ce=$:ab=#:ae=$:da:\
+	:sb=("|'):se=(\e"|\e'):\
+	:kw=function for while repeat if else break next stop switch: