diff options
| author | tgrogers <[email protected]> | 2018-03-28 16:43:39 -0400 |
|---|---|---|
| committer | tgrogers <[email protected]> | 2018-03-28 16:43:39 -0400 |
| commit | 4ca74a7fc0d94cc5256fd96821b94f3f5ea10501 (patch) | |
| tree | 85d5020b260abe27e94d15cb1cae1f74f997a0a9 /src/cuda-sim/ptx.y | |
| parent | a9fe78437c825116500e866799cd6fab04a1f9a5 (diff) | |
| parent | 268614ac4ab6ec8aec2e8e9bcc6357550e4eb608 (diff) | |
Merge remote-tracking branch 'public/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 ); } |