Submenu direct commands

Daniele Pallastrelli · Daniele Pallastrelli · commit fea8f2cb92b5 · 2017-02-17T09:45:41.000+01:00
diff --git a/cli/cli.h b/cli/cli.h
@@ -344,8 +344,18 @@ namespace cli
         {
             if ( cmdLine[ 0 ] == Name() )
             {
-                session.Current( this );
-                return true;
+                if ( cmdLine.size() == 1 )
+                {
+                    session.Current( this );
+                    return true;
+                }
+                else
+                {
+                    // check also for subcommands
+                    std::vector<std::string > subCmdLine( cmdLine.begin()+1, cmdLine.end() );
+                    for ( auto& cmd: cmds )
+                        if ( cmd -> Exec( subCmdLine, session ) ) return true;
+                }
             }
             return false;
         }
diff --git a/samples/main.cpp b/samples/main.cpp
@@ -62,6 +62,14 @@ int main()
             "hello",
             [](std::ostream& out){ out << "Hello, submenu world\n"; },
             "Print hello world in the submenu" );
+
+    auto subSubMenu = make_unique< Menu >( "subsub" );
+        subSubMenu -> Add(
+            "hello",
+            [](std::ostream& out){ out << "Hello, subsubmenu world\n"; },
+            "Print hello world in the sub-submenu" );
+    subMenu -> Add( std::move(subSubMenu));
+
     rootMenu -> Add( std::move(subMenu) );
 
 

Original file line number	Diff line number	Diff line change
`@@ -344,8 +344,18 @@ namespace cli`
`344`	`344`	`{`
`345`	`345`	`if ( cmdLine[ 0 ] == Name() )`
`346`	`346`	`{`
`347`		`- session.Current( this );`
`348`		`- return true;`
	`347`	`+ if ( cmdLine.size() == 1 )`
	`348`	`+ {`
	`349`	`+ session.Current( this );`
	`350`	`+ return true;`
	`351`	`+ }`
	`352`	`+ else`
	`353`	`+ {`
	`354`	`+ // check also for subcommands`
	`355`	`+ std::vector<std::string > subCmdLine( cmdLine.begin()+1, cmdLine.end() );`
	`356`	`+ for ( auto& cmd: cmds )`
	`357`	`+ if ( cmd -> Exec( subCmdLine, session ) ) return true;`
	`358`	`+ }`
`349`	`359`	`}`
`350`	`360`	`return false;`
`351`	`361`	`}`