Deleted Added
sdiff udiff text old ( 1949 ) new ( 4791 )
full compact
config.y (1949) config.y (4791)
1%union {
2 char *str;
3 int val;
4 struct file_list *file;
5 struct idlst *lst;
6}
7
8%token AND

--- 53 unchanged lines hidden (view full) ---

62%type <str> Opt_value
63%type <str> Dev
64%type <lst> Id_list
65%type <val> optional_size
66%type <val> optional_sflag
67%type <str> device_name
68%type <val> major_minor
69%type <val> arg_device_spec
1%union {
2 char *str;
3 int val;
4 struct file_list *file;
5 struct idlst *lst;
6}
7
8%token AND

--- 53 unchanged lines hidden (view full) ---

62%type <str> Opt_value
63%type <str> Dev
64%type <lst> Id_list
65%type <val> optional_size
66%type <val> optional_sflag
67%type <str> device_name
68%type <val> major_minor
69%type <val> arg_device_spec
70%type root_device_spec
70%type <val> root_device_spec root_device_specs
71%type <val> dump_device_spec
72%type <file> swap_device_spec
73%type <file> comp_device_spec
74
75%{
76
77/*
78 * Copyright (c) 1988, 1993

--- 28 unchanged lines hidden (view full) ---

107 * SUCH DAMAGE.
108 *
109 * @(#)config.y 8.1 (Berkeley) 6/6/93
110 */
111
112#include "config.h"
113#include <ctype.h>
114#include <stdio.h>
71%type <val> dump_device_spec
72%type <file> swap_device_spec
73%type <file> comp_device_spec
74
75%{
76
77/*
78 * Copyright (c) 1988, 1993

--- 28 unchanged lines hidden (view full) ---

107 * SUCH DAMAGE.
108 *
109 * @(#)config.y 8.1 (Berkeley) 6/6/93
110 */
111
112#include "config.h"
113#include <ctype.h>
114#include <stdio.h>
115#include <err.h>
115
116struct device cur;
117struct device *curp = 0;
118char *temp_id;
119char *val_id;
120
121%}
122%%

--- 157 unchanged lines hidden (view full) ---

280
281 fl->f_swapdev = $1;
282 fl->f_fn = devtoname($1);
283 $$ = fl;
284 }
285 ;
286
287root_spec:
116
117struct device cur;
118struct device *curp = 0;
119char *temp_id;
120char *val_id;
121
122%}
123%%

--- 157 unchanged lines hidden (view full) ---

281
282 fl->f_swapdev = $1;
283 fl->f_fn = devtoname($1);
284 $$ = fl;
285 }
286 ;
287
288root_spec:
288 ROOT optional_on root_device_spec
289 ROOT optional_on root_device_specs
289 = {
290 struct file_list *fl = *confp;
291
292 if (fl && fl->f_rootdev != NODEV)
293 yyerror("extraneous root device specification");
294 else
295 fl->f_rootdev = $3;
296 }
297 ;
298
290 = {
291 struct file_list *fl = *confp;
292
293 if (fl && fl->f_rootdev != NODEV)
294 yyerror("extraneous root device specification");
295 else
296 fl->f_rootdev = $3;
297 }
298 ;
299
300root_device_specs:
301 root_device_spec AND root_device_specs
302 = {
303 warnx("extraneous root devices ignored");
304 $$ = $1;
305 }
306 | root_device_spec
307 ;
308
299root_device_spec:
300 device_name
301 = { $$ = nametodev($1, 0, 'a'); }
302 | major_minor
303 ;
304
305dump_spec:
306 DUMPS optional_on dump_device_spec

--- 809 unchanged lines hidden --- 		309root_device_spec:
310 device_name
311 = { $$ = nametodev($1, 0, 'a'); }
312 | major_minor
313 ;
314
315dump_spec:
316 DUMPS optional_on dump_device_spec

--- 809 unchanged lines hidden ---