From 6985a4205b4a4aa18e580025134726e34269aecf Mon Sep 17 00:00:00 2001 From: David Reiss Date: Tue, 24 Mar 2009 20:00:47 +0000 Subject: [PATCH] THRIFT-136. s/async/oneway/ in lexer and parser variables This is an internal-only change. git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@757988 13f79535-47bb-0310-9956-ffa450edef68 --- compiler/cpp/src/thriftl.ll | 2 +- compiler/cpp/src/thrifty.yy | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/cpp/src/thriftl.ll b/compiler/cpp/src/thriftl.ll index ef49577e0..60a7f2c78 100644 --- a/compiler/cpp/src/thriftl.ll +++ b/compiler/cpp/src/thriftl.ll @@ -106,7 +106,7 @@ st_identifier ([a-zA-Z-][\.a-zA-Z_0-9-]*) "map" { return tok_map; } "list" { return tok_list; } "set" { return tok_set; } -"async" { return tok_async; } +"async" { return tok_oneway; } "typedef" { return tok_typedef; } "struct" { return tok_struct; } "exception" { return tok_xception; } diff --git a/compiler/cpp/src/thrifty.yy b/compiler/cpp/src/thrifty.yy index 743fa2c7c..b6bdf6452 100644 --- a/compiler/cpp/src/thrifty.yy +++ b/compiler/cpp/src/thrifty.yy @@ -120,7 +120,7 @@ int g_arglist = 0; /** * Function modifiers */ -%token tok_async +%token tok_oneway /** * Thrift language keywords @@ -189,7 +189,7 @@ int g_arglist = 0; %type Throws %type Extends -%type Async +%type Oneway %type XsdAll %type XsdOptional %type XsdNillable @@ -778,7 +778,7 @@ FunctionList: } Function: - CaptureDocText Async FunctionType tok_identifier '(' FieldList ')' Throws CommaOrSemicolonOptional + CaptureDocText Oneway FunctionType tok_identifier '(' FieldList ')' Throws CommaOrSemicolonOptional { $6->set_name(std::string($4) + "_args"); $$ = new t_function($3, $4, $6, $8, $2); @@ -787,8 +787,8 @@ Function: } } -Async: - tok_async +Oneway: + tok_oneway { $$ = true; }