Skip to content

Commit

Permalink
Merge pull request #1 from kirillsud/master
Browse files Browse the repository at this point in the history
Fixed parsing function arguments when reference simbol and variable name wrote together
  • Loading branch information
comm644 committed Nov 21, 2014
2 parents 331dad2 + c054ef2 commit ae77c53
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Readme.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Build Status](https://travis-ci.org/comm644/cxxmock.svg?branch=master)](https://travis-ci.org/comm644/cxxmock)
[![Build Status](https://travis-ci.org/kirillsud/cxxmock.svg?branch=master)](https://travis-ci.org/kirillsud/cxxmock)

About
==================================
Expand Down
2 changes: 1 addition & 1 deletion cxxmockgen.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
rxType = "(" + rxTypeBase + "(?:<\s*(?:template|class)?" + rxTypeBase + ">)?[&*]?)\s+";

rxName = "(\w+)\s*";
rxArg = "(" + rxType + rxName + ")";
rxArg = "(" + rxType + "&?" + rxName + ")";
rxArgList = "([,]?" + rxArg +")*";
rxMethod = re.compile("(virtual\s+("+rxType+ rxName +")\((.*)\)(\s*const)?)\s*=\s*0;");
rxClassLine = 'class\s+(\w+)\s*{?';
Expand Down
2 changes: 2 additions & 0 deletions tests/supportedInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ class Interface

virtual int canParseHakerCode(Type arg1, Type arg2) = 0;

virtual Type canParseReference(const Type &arg) = 0;

virtual void canSetConstParam(const Type* arg) = 0;

virtual void voidMethod() = 0;
Expand Down

0 comments on commit ae77c53

Please sign in to comment.