From e703054716d49c4fce7dcbfb92882649fa4a97c8 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 31 Aug 2016 01:26:08 +0300 Subject: [PATCH] Update INO2CPP examples --- tests/ino2cpp/basic/basic.ino | 29 +++++++++++++++++++++++------ tests/ino2cpp/multifiles/foo.pde | 5 +++-- tests/test_ino2cpp.py | 2 +- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/tests/ino2cpp/basic/basic.ino b/tests/ino2cpp/basic/basic.ino index 461399de..c44340aa 100644 --- a/tests/ino2cpp/basic/basic.ino +++ b/tests/ino2cpp/basic/basic.ino @@ -1,21 +1,38 @@ -struct MyItem { +typedef struct Item item; +struct Item { byte foo[50]; int bar; + void (*noob)(item*); }; +// test callback +class Foo { + + public: + Foo(void (*function)()) { + #warning "Line number is 13" + } + +}; + +Foo foo(&fooCallback); + +// + void setup() { - struct MyItem item1; + struct Item item1; myFunction(&item1); - - } -#warning "Line number is 13" void loop() { } -void myFunction(struct MyItem *item) { +void myFunction(struct Item *item) { + +} + +void fooCallback(){ } diff --git a/tests/ino2cpp/multifiles/foo.pde b/tests/ino2cpp/multifiles/foo.pde index 991bacbd..785166cd 100644 --- a/tests/ino2cpp/multifiles/foo.pde +++ b/tests/ino2cpp/multifiles/foo.pde @@ -1,5 +1,6 @@ +char buf[5]; + void setup() { - barFunc(); fooFunc(); } @@ -8,5 +9,5 @@ void loop() { } char* fooFunc() { - + return buf; } \ No newline at end of file diff --git a/tests/test_ino2cpp.py b/tests/test_ino2cpp.py index 12fde08a..c414ebc6 100644 --- a/tests/test_ino2cpp.py +++ b/tests/test_ino2cpp.py @@ -40,5 +40,5 @@ def test_warning_line(clirunner, validate_cliresult): result = clirunner.invoke(cmd_ci, [join(INOTEST_DIR, "basic"), "-b", "uno"]) validate_cliresult(result) - assert ('basic.ino:13:2: warning: #warning "Line number is 13"' in + assert ('basic.ino:13:4: warning: #warning "Line number is 13"' in result.output)