Merge pull request #1 from nimble-code/master

Just update

Author: mp81ss

Src/c_gram.y

@@ -1820,6 +1820,7 @@ extern int
 is_recorded(char *s, char *f)
 {	Recorded *r;
 
+	if (f && strlen(f) > 0)
 	for (r = recorded; r; r = r->nxt)
 		if (strcmp(r->fct, s) == 0
 		&&  (r->isstatic == 0 || strcmp(r->fnm, f) == 0))

Src/heap.c

@@ -154,7 +154,7 @@ HeapAlloc_Gen(Heap *heap)
 			}
 
 			heap->hunks[heap->num_hunks] =
-				(void *) emalloc(heap->chnk_sze * heap->ch_ratio);
+				(void *) emalloc((size_t) heap->chnk_sze * (size_t) heap->ch_ratio);
 
 #ifdef DEBUG
 	printf("2 chunk allocate at %p -- %d * %d bytes\n",
@@ -171,7 +171,7 @@ HeapAlloc_Gen(Heap *heap)
 				+ (heap->chnk_sze * chnk))); 
 		}
 	} else
-	{	heap->hunks[0] = (void *) emalloc(heap->chnk_sze * heap->ch_ratio);
+	{	heap->hunks[0] = (void *) emalloc((size_t) heap->chnk_sze * (size_t) heap->ch_ratio);
 #ifdef DEBUG
 	printf("1 chunk allocate at %p -- %d * %d bytes\n",
 		heap->hunks[0], heap->chnk_sze, heap->ch_ratio);

Src/makefile

@@ -25,8 +25,10 @@
 #
 BINDIR=/usr/local/bin/
 # note the terminal / in the above line is needed
+## 2019: too make extensions are made in the gcc headerfiles to allow the
+##       builtin parser to sill work reliably
 CC=gcc
-CFLAGS=-DPC -ansi -Wall -m32 -ggdb -DCPP="\"gcc -E\"" -DBINDIR=\"$(BINDIR)\"
+CFLAGS=-DPC -ansi -Wall -g -DCPP="\"gcc -E -D__extension__= -D__inline__= -D_Noreturn= -D__typeof__= \"" -DBINDIR=\"$(BINDIR)\"
 
 # on PC add:
 #	-DPC

Src/uno_local.c

@@ -521,23 +521,29 @@ main(int argc, char **argv)
 		if (parse_tree
 		&&  !see_extern_fcts
 		&&  !see_static_fcts)
-			lts_start(parse_tree);		/* uno_lts.c   */
+		{	lts_start(parse_tree);	/* uno_lts.c   */
+		}
 
 		if (show_syms)
-			show_symtab(contxt->syms, stdout);
+		{	show_symtab(contxt->syms, stdout);
+		}
 
 		if (Verbose)
-			memstats();
+		{	memstats();
+		}
 
 		free_context(contxt);	/* done with this file */
 
 		while (!is_empty(ParseStack))
-			delete_stk_item(pop(ParseStack));
+		{	delete_stk_item(pop(ParseStack));
+		}
 
 		if (Verbose>1) printf("parsestack\n");
 
 		while (!is_empty(DoneStack))
-			delete_stk_item(Parse_TOS = pop(DoneStack));
+		{	delete_stk_item(Parse_TOS = pop(DoneStack));
+		}
+
 		if (Verbose>1) printf("donestack\n");
 
 		Parse_TOS  = (Stk_Item  *) 0;

Src/uno_lts.c

@@ -2311,10 +2311,12 @@ ana_work(DefUse *d, SymList *s, treenode *n)
 
 	if (uno_ignore(s->sm)		/* symbol declared in "/usr/include/.." */
 	||  (s->mark & REF2))		/* x->ref2 or x.ref2 -- compounds not yet   */
-		return;
+	{	return;
+	}
 
 	if (uno_p == 4)	/* the default */
-		uno_bounds(s, d->aio, n);	/* array bounds */
+	{	uno_bounds(s, d->aio, n);	/* array bounds */
+	}
 
 try_again:
 	if (s->mark & FCALL)
@@ -2334,18 +2336,19 @@ ana_work(DefUse *d, SymList *s, treenode *n)
 			g->nxt = grst;
 			grst = g;
 		}
-
 		return;
 	} else if (is_recorded(s->sm->nme->str, n->hdr.fnm))	/* function name from prototype def */
 	{	s->mark |= FCALL;
 		goto try_again;
 	} else
-		if (debug) printf("\tnot a fcall...\n");
+	{	if (debug) printf("\tnot a fcall...\n");
+	}
 
 	if (s->sm->decl_level < FUNCTION_SCOPE)
-		global_var(s, n);
-	else
-		local_var(s, n);
+	{	global_var(s, n);
+	} else
+	{	local_var(s, n);
+	}
 }
 
 static void
@@ -2838,12 +2841,11 @@ dfs_uno(State *s)
 			dfstack->state->exp = s->n;
 			dfstack->state->val = ZT;
 		}
-
 		dfs_uno(t->branch);
 
 		if (exp)
-			prevpathcond();
-		else
+		{	prevpathcond();
+		} else
 		{	dfstack->state->nxt = pathfree;
 			pathfree = dfstack->state;
 			dfstack->state = (PathCond *) 0;