diff options
| author | tgrogers <[email protected]> | 2018-04-11 15:43:49 -0400 |
|---|---|---|
| committer | tgrogers <[email protected]> | 2018-04-11 15:43:49 -0400 |
| commit | 35eb8dfa699df3bd5526d8d659ffd754d54880cc (patch) | |
| tree | bf65659a4cf398d450dc8d9127377d642219319e /src/cuda-sim/ptx.y | |
| parent | 913c8934d89068ea96729b238a42879d2e02e7f4 (diff) | |
| parent | 2221d208a745a098a60b0d24c05007e92aaba092 (diff) | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'src/cuda-sim/ptx.y')
| -rw-r--r-- | src/cuda-sim/ptx.y | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cuda-sim/ptx.y b/src/cuda-sim/ptx.y index e00aa4b..4edae5d 100644 --- a/src/cuda-sim/ptx.y +++ b/src/cuda-sim/ptx.y @@ -47,7 +47,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. %token PTR_DIRECTIVE %token ENTRY_DIRECTIVE %token EXTERN_DIRECTIVE -%token WEAK_DIRECTIVE %token FILE_DIRECTIVE %token FUNC_DIRECTIVE %token GLOBAL_DIRECTIVE @@ -513,7 +512,8 @@ compare_spec:EQ_OPTION { add_option(EQ_OPTION); } | NAN_OPTION { add_option(NAN_OPTION); } ; -operand_list: operand +operand_list: /* empty*/ + | operand | operand COMMA operand_list; operand: IDENTIFIER { add_scalar_operand( $1 ); } |