From 5b842f7a19ccc5aa9de877418c4be05ca999752b Mon Sep 17 00:00:00 2001 From: Prashanth Mundkur Date: Mon, 6 Apr 2009 11:42:07 -0700 Subject: [PATCH] rename _prod to _tuple --- libs/json/parser.mly | 10 +++++----- libs/json/syntax.ml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/json/parser.mly b/libs/json/parser.mly index fe92579..c9eb750 100644 --- a/libs/json/parser.mly +++ b/libs/json/parser.mly @@ -83,7 +83,7 @@ repn: | expr { $1 } | expr STAR tuple - { C_prod ($1 :: (List.rev $3)) } + { C_tuple ($1 :: (List.rev $3)) } | record { C_record (List.rev $1) } | variant @@ -93,7 +93,7 @@ expr: | LPAREN expr RPAREN { $2 } | LPAREN expr STAR tuple RPAREN - { C_prod ($2 :: (List.rev $4)) } + { C_tuple ($2 :: (List.rev $4)) } | expr OPTION { C_option $1 } | expr LIST @@ -145,10 +145,10 @@ variant: constr: | UIDENT - { CD_prod ($1, []) } + { CD_tuple ($1, []) } | UIDENT OF expr - { CD_prod ($1, [ $3 ]) } + { CD_tuple ($1, [ $3 ]) } | UIDENT OF expr STAR tuple - { CD_prod ($1, ($3 :: (List.rev $5))) } + { CD_tuple ($1, ($3 :: (List.rev $5))) } diff --git a/libs/json/syntax.ml b/libs/json/syntax.ml index 79bce1b..d74b3bf 100644 --- a/libs/json/syntax.ml +++ b/libs/json/syntax.ml @@ -33,12 +33,12 @@ type complex_type = | C_option of complex_type | C_list of complex_type | C_array of complex_type - | C_prod of complex_type list + | C_tuple of complex_type list | C_record of (string * complex_type) list | C_variant of constr_decl list and constr_decl = - | CD_prod of string * complex_type list + | CD_tuple of string * complex_type list type type_defn = (string * complex_type) list -- 2.39.5