Thu Oct 29 14:36:14 2009 UTC ()
option noinput


(christos)
diff -r1.13 -r1.14 src/usr.bin/menuc/Makefile
diff -r1.14 -r1.15 src/usr.bin/menuc/scan.l
cvs diff -r1.13 -r1.14 src/usr.bin/menuc/Makefile (expand / switch to unified diff)

--- src/usr.bin/menuc/Makefile 2009/04/20 16:05:30 1.13
+++ src/usr.bin/menuc/Makefile 2009/10/29 14:36:14 1.14
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: Makefile,v 1.13 2009/04/20 16:05:30 drochner Exp $ 1# $NetBSD: Makefile,v 1.14 2009/10/29 14:36:14 christos Exp $
2 2
3WARNS?= 1 # XXX -Wshadow -Wcast-qual issues 3WARNS?= 1 # XXX -Wshadow -Wcast-qual issues
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7PROG= menuc 7PROG= menuc
8SRCS= main.c parse.y scan.l avl.c mdb.c util.c 8SRCS= main.c parse.y scan.l avl.c mdb.c util.c
9CPPFLAGS+= -I. -I${.CURDIR} -DYY_NO_INPUT 9CPPFLAGS+= -I. -I${.CURDIR}
10YHEADER= 10YHEADER=
11 11
12.if ${MKSHARE} != "no" 12.if ${MKSHARE} != "no"
13FILES= menu_sys.def 13FILES= menu_sys.def
14FILESDIR= /usr/share/misc 14FILESDIR= /usr/share/misc
15.endif 15.endif
16 16
17.ifndef HOSTPROG 17.ifndef HOSTPROG
18LDADD+= -ll 18LDADD+= -ll
19DPADD+= ${LIBL} 19DPADD+= ${LIBL}
20.endif 20.endif
21 21
22.include <bsd.prog.mk> 22.include <bsd.prog.mk>
cvs diff -r1.14 -r1.15 src/usr.bin/menuc/scan.l (expand / switch to unified diff)

--- src/usr.bin/menuc/scan.l 2004/08/02 21:29:07 1.14
+++ src/usr.bin/menuc/scan.l 2009/10/29 14:36:14 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: scan.l,v 1.14 2004/08/02 21:29:07 dsl Exp $ */ 1/* $NetBSD: scan.l,v 1.15 2009/10/29 14:36:14 christos Exp $ */
2 2
3/* 3/*
4 * Copyright 1997 Piermont Information Systems Inc. 4 * Copyright 1997 Piermont Information Systems Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Philip A. Nelson for Piermont Information Systems Inc. 7 * Written by Philip A. Nelson for Piermont Information Systems Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -42,26 +42,28 @@ @@ -42,26 +42,28 @@
42#include <stdio.h> 42#include <stdio.h>
43#include <string.h> 43#include <string.h>
44#include "defs.h" 44#include "defs.h"
45#include "parse.h" 45#include "parse.h"
46 46
47static int level; /* For nested comments. */ 47static int level; /* For nested comments. */
48static int comstart; /* line number of comment start. */ 48static int comstart; /* line number of comment start. */
49 49
50%} 50%}
51 51
52%x COMMENT 52%x COMMENT
53%x BRACE 53%x BRACE
54 54
 55%option noinput
 56
55%% 57%%
56 58
57[ \t]+ { /* ignore spaces and tabs */ } 59[ \t]+ { /* ignore spaces and tabs */ }
58 60
59[\n] { line_no++; } 61[\n] { line_no++; }
60 62
61"="|";"|","|"("|")" { return (int)yytext[0]; } 63"="|";"|","|"("|")" { return (int)yytext[0]; }
62 64
63x { return X; } 65x { return X; }
64 66
65y { return Y; } 67y { return Y; }
66 68
67w { return W; } 69w { return W; }