commit 20f08d4aa462692d46ee3c07d0f72934c85ead8b
author Yifan Hong <elsk@google.com> Wed Dec 14 22:27:57 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 14 22:27:57 2016 +0000
tree 81d8e7b5dae340516e7491faa272bb7a1aee5d40
parent 7763ab3046cb998ac8a32b8d2312981631886813
parent aafed707b7ed7c79645d508f140db55cfabfe74e

Merge "Fix -Landroidbp-impl generates file with wrong name."

Method.cpp

diff --git a/Method.cpp b/Method.cpp
index 284339e..bfd28c9 100644
--- a/Method.cpp
+++ b/Method.cpp
@@ -235,5 +235,14 @@
     return mType->isJavaCompatible();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+bool TypedVarVector::add(TypedVar *v) {
+    if (mNames.emplace(v->name()).second) {
+        push_back(v);
+        return true;
+    }
+    return false;
+}
+
 }  // namespace android
 

Method.h

diff --git a/Method.h b/Method.h
index 4f5163d..6981b72 100644
--- a/Method.h
+++ b/Method.h
@@ -21,6 +21,7 @@
 #include <android-base/macros.h>
 #include <functional>
 #include <hidl-util/Formatter.h>
+#include <set>
 #include <string>
 #include <vector>
 
@@ -31,6 +32,7 @@
 struct ScalarType;
 struct Type;
 struct TypedVar;
+struct TypedVarVector;
 
 using MethodImpl = std::function<void(Formatter &)>;
 
@@ -107,6 +109,14 @@
     DISALLOW_COPY_AND_ASSIGN(TypedVar);
 };
 
+struct TypedVarVector : public std::vector<TypedVar *> {
+    TypedVarVector() = default;
+
+    bool add(TypedVar *v);
+private:
+    std::set<std::string> mNames;
+};
+
 }  // namespace android
 
 #endif  // METHOD_H_

hidl-gen_y.yy

diff --git a/hidl-gen_y.yy b/hidl-gen_y.yy
index 4f932e5..9c0e75b 100644
--- a/hidl-gen_y.yy
+++ b/hidl-gen_y.yy
@@ -268,7 +268,7 @@
     android::ConstantExpression *constantExpression;
     std::vector<android::EnumValue *> *enumValues;
     android::TypedVar *typedVar;
-    std::vector<android::TypedVar *> *typedVars;
+    android::TypedVarVector *typedVars;
     android::Method *method;
     android::CompoundType::Style compoundStyle;
     std::vector<std::string> *stringVec;
@@ -746,17 +746,25 @@
 typed_vars
     : /* empty */
       {
-          $$ = new std::vector<TypedVar *>;
+          $$ = new TypedVarVector();
       }
     | typed_var
       {
-          $$ = new std::vector<TypedVar *>;
-          $$->push_back($1);
+          $$ = new TypedVarVector();
+          if (!$$->add($1)) {
+              std::cerr << "ERROR: duplicated argument or result name "
+                  << $1->name() << " at " << @1 << "\n";
+              ast->addSyntaxError();
+          }
       }
     | typed_vars ',' typed_var
       {
           $$ = $1;
-          $$->push_back($3);
+          if (!$$->add($3)) {
+              std::cerr << "ERROR: duplicated argument or result name "
+                  << $3->name() << " at " << @3 << "\n";
+              ast->addSyntaxError();
+          }
       }
     ;
 

test/errors/syntax/1.0/IEx1.hal

diff --git a/test/errors/syntax/1.0/IEx1.hal b/test/errors/syntax/1.0/IEx1.hal
index 33fc576..bc48d01 100644
--- a/test/errors/syntax/1.0/IEx1.hal
+++ b/test/errors/syntax/1.0/IEx1.hal
@@ -99,4 +99,8 @@
 
     }
     struct Good {};
+
+    duplicatedArg(int32_t bar, MultiDimensional bar);
+    duplicatedResult() generates (uint32_t baz, bool baz);
+
 } // another semicolon

test/errors/syntax/1.0/README

diff --git a/test/errors/syntax/1.0/README b/test/errors/syntax/1.0/README
index d7b9fd9..7e2f04e 100644
--- a/test/errors/syntax/1.0/README
+++ b/test/errors/syntax/1.0/README
@@ -1,5 +1,5 @@
 Run with
 
 croot
-hidl-gen -Lc++ -r tests:system/tools/hidl/test -o ~/temp \
+hidl-gen -Lc++ -r tests:system/tools/hidl/test -r android.hidl:system/libhidl/transport -o ~/temp \
     tests.errors.syntax@1.0