1010 *
1111 *
1212 * IDENTIFICATION
13- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.38 1997/08/21 01:34:44 vadim Exp $
13+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.39 1997/08/22 03:17:55 vadim Exp $
1414 *
1515 * HISTORY
1616 * AUTHORDATEMAJOR EVENT
@@ -84,7 +84,7 @@ static Node *makeA_Expr(int oper, char *opname, Node *lexpr, Node *rexpr);
8484 Attr*attr;
8585
8686 ColumnDef*coldef;
87- ConstaintDef *constrdef;
87+ ConstraintDef *constrdef;
8888 TypeName*typnam;
8989 DefElem*defelt;
9090 ParamString*param;
@@ -352,7 +352,8 @@ columnDef: Id Typename OptDefault opt_null
352352}
353353;
354354
355- OptDefault: DEFAULT default_expr{
355+ OptDefault: DEFAULT default_expr
356+ {
356357 int deflen = CurScanPosition() - DefaultStartPosition;
357358 char *defval;
358359
@@ -453,8 +454,7 @@ default_expr_list: default_expr_or_null
453454{ $$ = lappend($1, $3); }
454455;
455456
456- opt_null:PNULL{ $$ = false; }
457- | NOT PNULL{ $$ = true; }
457+ opt_null: NOT PNULL{ $$ = true; }
458458| NOTNULL{ $$ = true; }
459459| /* EMPTY */{ $$ = false; }
460460;
@@ -610,7 +610,7 @@ ConstraintElem:
610610;
611611
612612ConstraintDef: CHECK a_expr{
613- ConstaintDef *constr = palloc (sizeof(ConstaintDef ));
613+ ConstraintDef *constr = palloc (sizeof(ConstraintDef ));
614614 int chklen = CurScanPosition() - CheckStartPosition;
615615 char *check;
616616
@@ -621,7 +621,7 @@ ConstraintDef: CHECK a_expr{
621621 check[chklen] = 0;
622622 constr->type = CONSTR_CHECK;
623623 constr->name = NULL;
624- constr->expr = check;
624+ constr->def = (void*) check;
625625 $$ = constr;
626626}
627627;