Commit faf196c6 authored by John Ellson's avatar John Ellson

Merge branch 'master' of github.com:ellson/graphviz

parents 250243bb df389bcc
......@@ -125,14 +125,28 @@ static void ppDirective (void)
}
}
/* twoDots:
* Return true if token has more than one '.';
* we know the last character is a '.'.
*/
static int twoDots(void)
{
int i;
for (i = yyleng-2; i >= 0; i--) {
if (((unsigned char)yytext[i]) == '.')
return 1;
}
return 0;
}
/* chkNum:
* The regexp for NUMBER allows a terminating letter.
* The regexp for NUMBER allows a terminating letter or '.'.
* This way we can catch a number immediately followed by a name
* and report this to the user.
* or something like 123.456.78, and report this to the user.
*/
static int chkNum(void) {
unsigned char c = (unsigned char)yytext[yyleng-1]; /* last character */
if (!isdigit(c) && (c != '.')) { /* c is letter */
if ((!isdigit(c) && (c != '.')) || ((c == '.') && twoDots())) { /* c is letter */
unsigned char xbuf[BUFSIZ];
char buf[BUFSIZ];
agxbuf xb;
......@@ -171,7 +185,7 @@ GRAPH_EOF_TOKEN [@]
LETTER [A-Za-z_\200-\377]
DIGIT [0-9]
NAME {LETTER}({LETTER}|{DIGIT})*
NUMBER [-]?(({DIGIT}+(\.{DIGIT}*)?)|(\.{DIGIT}+)){LETTER}?
NUMBER [-]?(({DIGIT}+(\.{DIGIT}*)?)|(\.{DIGIT}+))(\.|{LETTER})?
ID ({NAME}|{NUMBER})
%x comment
%x qstring
......
......@@ -57,9 +57,7 @@ $(GV_DIR)/cmd/dot/.libs/$(DOT): $(GV_DIR)/Makefile
@echo MAKING GRAPHVIZ...
@echo
if [[ -e $@ ]]; then $(MAKE) -C $(GV_DIR) clean; fi
$(MAKE) -C $(GV_DIR)/tclpkg/tkstubs
$(MAKE) -C $(GV_DIR)/tclpkg/tclstubs
$(MAKE) -C $(GV_DIR)/tclpkg/tkspline CFLAGS="-O2 -arch ppc -arch i386 -I$(PREFIX)/include" LDFLAGS="-arch ppc -arch i386 -L$(PREFIX)/lib -Wl,-dead_strip"
$(MAKE) -C $(GV_DIR)
$(GV_DIR)/Makefile: $(GV_DIR)/configure
......
......@@ -62,9 +62,7 @@ $(GV_DIR)/cmd/dot/.libs/$(DOT): $(GV_DIR)/Makefile
@echo MAKING GRAPHVIZ...
@echo
if [[ -e $@ ]]; then $(MAKE) -C $(GV_DIR) clean; fi
$(MAKE) -C $(GV_DIR)/tclpkg/tkstubs
$(MAKE) -C $(GV_DIR)/tclpkg/tclstubs
$(MAKE) -C $(GV_DIR)/tclpkg/tkspline CFLAGS="-O2 $(ARCH) -I$(PREFIX)/include" LDFLAGS="$(ARCH) -L$(PREFIX)/lib -Wl,-dead_strip"
$(MAKE) -C $(GV_DIR)
$(GV_DIR)/Makefile: $(GV_DIR)/configure
......
......@@ -62,9 +62,7 @@ $(GV_DIR)/cmd/dot/.libs/$(DOT): $(GV_DIR)/Makefile
@echo MAKING GRAPHVIZ...
@echo
if [[ -e $@ ]]; then $(MAKE) -C $(GV_DIR) clean; fi
$(MAKE) -C $(GV_DIR)/tclpkg/tkstubs
$(MAKE) -C $(GV_DIR)/tclpkg/tclstubs
$(MAKE) -C $(GV_DIR)/tclpkg/tkspline CFLAGS="-O2 $(ARCH) -I$(PREFIX)/include" LDFLAGS="$(ARCH) -L$(PREFIX)/lib -Wl,-dead_strip"
$(MAKE) -C $(GV_DIR)
$(GV_DIR)/Makefile: $(GV_DIR)/configure
......
......@@ -62,9 +62,7 @@ $(GV_DIR)/cmd/dot/.libs/$(DOT): $(GV_DIR)/Makefile
@echo MAKING GRAPHVIZ...
@echo
if [[ -e $@ ]]; then $(MAKE) -C $(GV_DIR) clean; fi
$(MAKE) -C $(GV_DIR)/tclpkg/tkstubs
$(MAKE) -C $(GV_DIR)/tclpkg/tclstubs
$(MAKE) -C $(GV_DIR)/tclpkg/tkspline CFLAGS="-O2 $(ARCH) -I$(PREFIX)/include" LDFLAGS="$(ARCH) -L$(PREFIX)/lib -Wl,-dead_strip"
$(MAKE) -C $(GV_DIR)
$(GV_DIR)/Makefile: $(GV_DIR)/configure
......
......@@ -62,9 +62,7 @@ $(GV_DIR)/cmd/dot/$(DOT): $(GV_DIR)/Makefile
@echo MAKING GRAPHVIZ...
@echo
if [[ -e $@ ]]; then $(MAKE) -C $(GV_DIR) clean; fi
$(MAKE) -C $(GV_DIR)/tclpkg/tkstubs
$(MAKE) -C $(GV_DIR)/tclpkg/tclstubs
$(MAKE) -C $(GV_DIR)/tclpkg/tkspline CFLAGS="-O2 $(ARCHS32) -I$(PREFIX)/include" LDFLAGS="$(ARCHS32) -L$(PREFIX)/lib -Wl,-dead_strip"
$(MAKE) -C $(GV_DIR)
$(GV_DIR)/Makefile: $(GV_DIR)/configure
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment