Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/gnu/dist/groff/src/preproc Fix up the bogosity in .y->.cc ha...



details:   https://anonhg.NetBSD.org/src/rev/166970173c63
branches:  trunk
changeset: 517413:166970173c63
user:      tv <tv%NetBSD.org@localhost>
date:      Mon Nov 12 17:09:03 2001 +0000

description:
Fix up the bogosity in .y->.cc handling.  Don't generate files in $(srcdir),
and make sure to have dependencies for lex.o in eqn and pic (so that the .h
is guaranteed to exist).

diffstat:

 gnu/dist/groff/src/preproc/eqn/Makefile.sub   |    6 +-
 gnu/dist/groff/src/preproc/eqn/eqn_tab.h      |   69 -------------
 gnu/dist/groff/src/preproc/pic/Makefile.sub   |    6 +-
 gnu/dist/groff/src/preproc/pic/pic_tab.h      |  132 --------------------------
 gnu/dist/groff/src/preproc/refer/Makefile.sub |    2 +-
 5 files changed, 9 insertions(+), 206 deletions(-)

diffs (253 lines):

diff -r 3ecf282b029e -r 166970173c63 gnu/dist/groff/src/preproc/eqn/Makefile.sub
--- a/gnu/dist/groff/src/preproc/eqn/Makefile.sub       Mon Nov 12 16:44:10 2001 +0000
+++ b/gnu/dist/groff/src/preproc/eqn/Makefile.sub       Mon Nov 12 17:09:03 2001 +0000
@@ -37,8 +37,8 @@
   $(srcdir)/eqn.h \
   $(srcdir)/pbox.h
 GRAM=$(srcdir)/eqn.y
-YTABC=$(srcdir)/eqn.cc
-YTABH=$(srcdir)/eqn_tab.h
+YTABC=eqn.cc
+YTABH=eqn_tab.h
 NAMEPREFIX=$(g)
 CLEANADD=neqn
 
@@ -55,3 +55,5 @@
 
 uninstall_sub:
        -rm -f $(bindir)/$(NAMEPREFIX)neqn
+
+lex.o: eqn.cc
diff -r 3ecf282b029e -r 166970173c63 gnu/dist/groff/src/preproc/eqn/eqn_tab.h
--- a/gnu/dist/groff/src/preproc/eqn/eqn_tab.h  Mon Nov 12 16:44:10 2001 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*     $NetBSD: eqn_tab.h,v 1.1.1.1 2001/04/19 12:51:41 wiz Exp $      */
-
-#define OVER 257
-#define SMALLOVER 258
-#define SQRT 259
-#define SUB 260
-#define SUP 261
-#define LPILE 262
-#define RPILE 263
-#define CPILE 264
-#define PILE 265
-#define LEFT 266
-#define RIGHT 267
-#define TO 268
-#define FROM 269
-#define SIZE 270
-#define FONT 271
-#define ROMAN 272
-#define BOLD 273
-#define ITALIC 274
-#define FAT 275
-#define ACCENT 276
-#define BAR 277
-#define UNDER 278
-#define ABOVE 279
-#define TEXT 280
-#define QUOTED_TEXT 281
-#define FWD 282
-#define BACK 283
-#define DOWN 284
-#define UP 285
-#define MATRIX 286
-#define COL 287
-#define LCOL 288
-#define RCOL 289
-#define CCOL 290
-#define MARK 291
-#define LINEUP 292
-#define TYPE 293
-#define VCENTER 294
-#define PRIME 295
-#define SPLIT 296
-#define NOSPLIT 297
-#define UACCENT 298
-#define SPECIAL 299
-#define SPACE 300
-#define GFONT 301
-#define GSIZE 302
-#define DEFINE 303
-#define NDEFINE 304
-#define TDEFINE 305
-#define SDEFINE 306
-#define UNDEF 307
-#define IFDEF 308
-#define INCLUDE 309
-#define DELIM 310
-#define CHARTYPE 311
-#define SET 312
-#define GRFONT 313
-#define GBFONT 314
-typedef union {
-       char *str;
-       box *b;
-       pile_box *pb;
-       matrix_box *mb;
-       int n;
-       column *col;
-} YYSTYPE;
-extern YYSTYPE yylval;
diff -r 3ecf282b029e -r 166970173c63 gnu/dist/groff/src/preproc/pic/Makefile.sub
--- a/gnu/dist/groff/src/preproc/pic/Makefile.sub       Mon Nov 12 16:44:10 2001 +0000
+++ b/gnu/dist/groff/src/preproc/pic/Makefile.sub       Mon Nov 12 17:09:03 2001 +0000
@@ -26,6 +26,8 @@
   $(srcdir)/position.h \
   $(srcdir)/text.h
 GRAM=$(srcdir)/pic.y
-YTABC=$(srcdir)/pic.cc
-YTABH=$(srcdir)/pic_tab.h
+YTABC=pic.cc
+YTABH=pic_tab.h
 NAMEPREFIX=$(g)
+
+lex.o: pic.cc
diff -r 3ecf282b029e -r 166970173c63 gnu/dist/groff/src/preproc/pic/pic_tab.h
--- a/gnu/dist/groff/src/preproc/pic/pic_tab.h  Mon Nov 12 16:44:10 2001 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-/*     $NetBSD: pic_tab.h,v 1.1.1.1 2001/04/19 12:51:34 wiz Exp $      */
-
-#define LABEL 257
-#define VARIABLE 258
-#define NUMBER 259
-#define TEXT 260
-#define COMMAND_LINE 261
-#define DELIMITED 262
-#define ORDINAL 263
-#define TH 264
-#define LEFT_ARROW_HEAD 265
-#define RIGHT_ARROW_HEAD 266
-#define DOUBLE_ARROW_HEAD 267
-#define LAST 268
-#define UP 269
-#define DOWN 270
-#define LEFT 271
-#define RIGHT 272
-#define BOX 273
-#define CIRCLE 274
-#define ELLIPSE 275
-#define ARC 276
-#define LINE 277
-#define ARROW 278
-#define MOVE 279
-#define SPLINE 280
-#define HEIGHT 281
-#define RADIUS 282
-#define WIDTH 283
-#define DIAMETER 284
-#define FROM 285
-#define TO 286
-#define AT 287
-#define WITH 288
-#define BY 289
-#define THEN 290
-#define DOTTED 291
-#define DASHED 292
-#define CHOP 293
-#define SAME 294
-#define INVISIBLE 295
-#define LJUST 296
-#define RJUST 297
-#define ABOVE 298
-#define BELOW 299
-#define OF 300
-#define THE 301
-#define WAY 302
-#define BETWEEN 303
-#define AND 304
-#define HERE 305
-#define DOT_N 306
-#define DOT_E 307
-#define DOT_W 308
-#define DOT_S 309
-#define DOT_NE 310
-#define DOT_SE 311
-#define DOT_NW 312
-#define DOT_SW 313
-#define DOT_C 314
-#define DOT_START 315
-#define DOT_END 316
-#define DOT_X 317
-#define DOT_Y 318
-#define DOT_HT 319
-#define DOT_WID 320
-#define DOT_RAD 321
-#define SIN 322
-#define COS 323
-#define ATAN2 324
-#define LOG 325
-#define EXP 326
-#define SQRT 327
-#define K_MAX 328
-#define K_MIN 329
-#define INT 330
-#define RAND 331
-#define SRAND 332
-#define COPY 333
-#define THRU 334
-#define TOP 335
-#define BOTTOM 336
-#define UPPER 337
-#define LOWER 338
-#define SH 339
-#define PRINT 340
-#define CW 341
-#define CCW 342
-#define FOR 343
-#define DO 344
-#define IF 345
-#define ELSE 346
-#define ANDAND 347
-#define OROR 348
-#define NOTEQUAL 349
-#define EQUALEQUAL 350
-#define LESSEQUAL 351
-#define GREATEREQUAL 352
-#define LEFT_CORNER 353
-#define RIGHT_CORNER 354
-#define CENTER 355
-#define END 356
-#define START 357
-#define RESET 358
-#define UNTIL 359
-#define PLOT 360
-#define THICKNESS 361
-#define FILL 362
-#define ALIGNED 363
-#define SPRINTF 364
-#define COMMAND 365
-#define DEFINE 366
-#define UNDEF 367
-typedef union {
-       char *str;
-       int n;
-       double x;
-       struct { double x, y; } pair;
-       struct { double x; char *body; } if_data;
-       struct { char *str; const char *filename; int lineno; } lstr;
-       struct { double *v; int nv; int maxv; } dv;
-       struct { double val; int is_multiplicative; } by;
-       place pl;
-       object *obj;
-       corner crn;
-       path *pth;
-       object_spec *spec;
-       saved_state *pstate;
-       graphics_state state;
-       object_type obtype;
-} YYSTYPE;
-extern YYSTYPE yylval;
diff -r 3ecf282b029e -r 166970173c63 gnu/dist/groff/src/preproc/refer/Makefile.sub
--- a/gnu/dist/groff/src/preproc/refer/Makefile.sub     Mon Nov 12 16:44:10 2001 +0000
+++ b/gnu/dist/groff/src/preproc/refer/Makefile.sub     Mon Nov 12 17:09:03 2001 +0000
@@ -19,5 +19,5 @@
   $(srcdir)/command.h \
   $(srcdir)/ref.h
 GRAM=$(srcdir)/label.y
-YTABC=$(srcdir)/label.cc
+YTABC=label.cc
 NAMEPREFIX=$(g)



Home | Main Index | Thread Index | Old Index