Minor changes to import ordering and parser-test output now sends e…

…rrors to correct streams; and emits error message (along with error code) when arguments aren't provided

.gitignore

@@ -47,3 +47,5 @@ test/Testing/
 .ninja_log
 build.ninja
 rules.ninja
+
+CMakeLists.txt.user

src/pypa/ast/dump.cc

@@ -11,9 +11,10 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#include <cassert>
+
 #include <pypa/ast/visitor.hh>
 #include <pypa/ast/tree_walker.hh>
-#include <cassert>
 
 namespace pypa {
 

src/pypa/filebuf.cc

@@ -21,7 +21,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #endif
-#include <stdio.h>
+#include <cstdio>
 
 namespace pypa {
 

src/pypa/filebuf.hh

@@ -14,10 +14,11 @@
 #ifndef GUARD_PYPA_FILEBUF_HH_INCLUDED
 #define GUARD_PYPA_FILEBUF_HH_INCLUDED
 
-#include <pypa/reader.hh>
 #include <cstddef>
 #include <string>
 
+#include <pypa/reader.hh>
+
 namespace pypa {
 
 #if defined(WIN32)

src/pypa/lexer/lexer.cc

@@ -11,14 +11,15 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#include <stack>
+#include <cassert>
+#include <fstream>
+
 #include <pypa/lexer/lexer.hh>
 #include <pypa/lexer/op.hh>
 #include <pypa/lexer/keyword.hh>
 #include <pypa/lexer/delim.hh>
 #include <pypa/filebuf.hh>
-#include <stack>
-#include <cassert>
-#include <fstream>
 
 namespace pypa {
     inline bool is_ident_char(char c, bool first = false) {

src/pypa/lexer/lexer.hh

@@ -14,15 +14,16 @@
 #ifndef GUARD_PYPA_TOKENIZER_LEXER_HH_INCLUDED
 #define GUARD_PYPA_TOKENIZER_LEXER_HH_INCLUDED
 
-#include <pypa/reader.hh>
-#include <pypa/lexer/tokendef.hh>
 #include <string>
 #include <deque>
 #include <list>
 #include <vector>
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 
+#include <pypa/reader.hh>
+#include <pypa/lexer/tokendef.hh>
+
 namespace pypa {
 
 struct TokenInfo {

src/pypa/parser/make_string.cc

@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <pypa/types.hh>
 #include <cassert>
 
+#include <pypa/types.hh>
+
 namespace pypa {
 
 inline bool isxdigit(char c) {

src/pypa/parser/parser.cc

@@ -11,12 +11,15 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
+#include <cassert>
+
 #include <gmp.h>
+
 #include <pypa/parser/apply.hh>
 #include <pypa/parser/parser_fwd.hh>
 #include <double-conversion/src/double-conversion.h>
 #include <pypa/ast/context_assign.hh>
-#include <cassert>
 
 namespace pypa {
 

src/pypa/parser/parser.hh

@@ -14,11 +14,12 @@
 #ifndef GUARD_PYPA_PARSER_PARSER_HH_INCLUDED
 #define GUARD_PYPA_PARSER_PARSER_HH_INCLUDED
 
+#include <functional>
+
 #include <pypa/ast/ast.hh>
 #include <pypa/lexer/lexer.hh>
 #include <pypa/parser/symbol_table.hh>
 #include <pypa/types.hh>
-#include <functional>
 
 namespace pypa {
 

src/pypa/parser/symbol_table.cc

@@ -11,10 +11,11 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#include <cassert>
+
 #include <pypa/parser/symbol_table.hh>
 #include <pypa/parser/symbol_table_visitor.hh>
 #include <pypa/ast/tree_walker.hh>
-#include <cassert>
 
 namespace pypa {
     void SymbolTable::enter_block(BlockType type, String const & name, Ast & a) {

src/pypa/parser/test.cc

@@ -11,15 +11,18 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
+#include <cstdio>
+
 #include <pypa/parser/parser.hh>
-#include <stdio.h>
 
 namespace pypa {
     void dump(AstPtr);
 }
 
 int main(int argc, char const ** argv) {
     if(argc != 2) {
+        fprintf(stderr, "Usage: %s <python_file_path>\n", argv[0]);
         return 1;
     }
     pypa::AstModulePtr ast;
@@ -34,7 +37,7 @@ int main(int argc, char const ** argv) {
         dump(ast);
     }
     else {
-        printf("Parsing failed\n");
+        fprintf(stderr, "Parsing failed\n");
         return 1;
     }
     return 0;