diff options
author | boris <boris@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-07-29 21:02:58 +0000 |
---|---|---|
committer | boris <boris@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-07-29 21:02:58 +0000 |
commit | bc9425eb0f9b08fe462d6083041a319a7b41af75 (patch) | |
tree | 76b281796c69e1a1a4dc34d3ed4b134f8be5f9ae | |
parent | 6ecbc48d799a39d98a992c0c86e9563bcf4e14f4 (diff) | |
download | ATCD-CCF.tar.gz |
ChangeLogTag: Tue Jul 29 15:36:20 2003 Boris Kolpackov <boris@dre.vanderbilt.edu>CCF
12 files changed, 80 insertions, 39 deletions
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLine.hpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLine.hpp index 94c05320287..1e5515355fe 100644 --- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLine.hpp +++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLine.hpp @@ -2,10 +2,8 @@ // Author : Boris Kolpackov <boris@dre.vanderbilt.edu> // $Id$ -#ifndef COMMAND_LINE_H -#define COMMAND_LINE_H - -#include "MSVC_Pragmas.hpp" +#ifndef COMMAND_LINE_HPP +#define COMMAND_LINE_HPP #include <algorithm> #include <vector> @@ -189,8 +187,13 @@ public: std::string const name_; }; - typedef std::vector<Option> Options; - typedef std::vector<std::string> Arguments; + typedef + std::vector<Option> + Options; + + typedef + std::vector<std::string> + Arguments; std::string command; Options options; @@ -199,4 +202,4 @@ public: bool separator; }; -#endif // COMMAND_LINE_H +#endif // COMMAND_LINE_HPP diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineDescriptor.hpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineDescriptor.hpp index ac2d3ef6488..25c90a8a60c 100644 --- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineDescriptor.hpp +++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineDescriptor.hpp @@ -1,4 +1,3 @@ -// $Id$ #ifndef COMMAND_LINE_DESCRIPTOR_H #define COMMAND_LINE_DESCRIPTOR_H diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineGrammar.hpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineGrammar.hpp index 89f1ccb90e2..de8164b6966 100644 --- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineGrammar.hpp +++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineGrammar.hpp @@ -5,8 +5,6 @@ #ifndef COMMAND_LINE_GRAMMAR_H #define COMMAND_LINE_GRAMMAR_H -#include "MSVC_Pragmas.hpp" - #include <vector> #include <string> @@ -21,7 +19,9 @@ using namespace boost::spirit; template <typename S> struct string_directive : public unary<S, parser<string_directive<S> > > { - typedef string_directive self_t; + typedef + string_directive + self_t; string_directive (S const& a) : unary<S, parser<string_directive<S> > > (a) @@ -32,9 +32,17 @@ struct string_directive : public unary<S, parser<string_directive<S> > > typename parser_result<self_t, ScannerT>::type parse(ScannerT const& scan) const { - typedef typename ScannerT::iterator_t Iterator; - typedef typename ScannerT::value_t Value; - typedef typename Value::const_iterator ValueIterator; + typedef + typename ScannerT::iterator_t + Iterator; + + typedef + typename ScannerT::value_t + Value; + + typedef + typename Value::const_iterator + ValueIterator; Iterator save = scan.first; @@ -172,11 +180,21 @@ struct CLineGrammar : public grammar<CLineGrammar> template <typename ScannerT> struct definition { - typedef typename ScannerT::value_t::const_iterator SLIterator; - typedef scanner<SLIterator, scanner_policies <> > SLScanner; - - typedef rule<ScannerT> Rule; - typedef rule<SLScanner> SLRule; + typedef + typename ScannerT::value_t::const_iterator + SLIterator; + + typedef + scanner<SLIterator, scanner_policies <> > + SLScanner; + + typedef + rule<ScannerT> + Rule; + + typedef + rule<SLScanner> + SLRule; Rule r_argument; @@ -203,11 +221,25 @@ struct CLineGrammar : public grammar<CLineGrammar> // Semantic actions - typedef SemanticAction<SLIterator, SetCommandName> CommandNameHandler; - typedef SetOptionName<SLIterator> OptionNameHandler; - typedef SemanticAction<SLIterator, SetOptionValue> OptionValueHandler; - typedef SemanticAction<SLIterator, SetArgument> ArgumentHandler; - typedef SemanticAction<SLIterator, SetSeparator> SeperatorHandler; + typedef + SemanticAction<SLIterator, SetCommandName> + CommandNameHandler; + + typedef + SetOptionName<SLIterator> + OptionNameHandler; + + typedef + SemanticAction<SLIterator, SetOptionValue> + OptionValueHandler; + + typedef + SemanticAction<SLIterator, SetArgument> + ArgumentHandler; + + typedef + SemanticAction<SLIterator, SetSeparator> + SeperatorHandler; /* diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineParser.cpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineParser.cpp index 0394f895669..629d954aa84 100644 --- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineParser.cpp +++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineParser.cpp @@ -5,6 +5,8 @@ #include "CCF/CodeGenerationKit/CommandLineParser.hpp" #include "CCF/CodeGenerationKit/CommandLineGrammar.hpp" +#include <vector> +#include <string> #include <iostream> using std::cerr; @@ -12,7 +14,9 @@ using std::endl; bool parse (int argc, char* argv[], CommandLine& cl) throw () { - typedef vector<string> Argv; + typedef + std::vector<std::string> + Argv; Argv v; diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineParser.hpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineParser.hpp index 920722403b3..98e897939e9 100644 --- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineParser.hpp +++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CommandLineParser.hpp @@ -5,8 +5,6 @@ #ifndef COMMAND_LINE_PARSER_H #define COMMAND_LINE_PARSER_H -#include "MSVC_Pragmas.hpp" - #include "CCF/CodeGenerationKit/CommandLine.hpp" bool parse (int argc, char* argv[], CommandLine& cl) throw (); diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/Regex.hpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/Regex.hpp index f9928441262..2708a8e05b1 100644 --- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/Regex.hpp +++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/Regex.hpp @@ -1,12 +1,11 @@ // file : CCF/CodeGenerationKit/Regex.hpp // author : Boris Kolpackov <boris@dre.vanderbilt.edu> +// cvs-id : $id$ // cvs-id : $Id$ #ifndef CCF_RUNTIME_REGEX_HPP #define CCF_RUNTIME_REGEX_HPP -#include "MSVC_Pragmas.hpp" - #include <string> #include <boost/regex.hpp> diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/ExH.hpp b/TAO/CIAO/CCF/CCF/CompilerElements/ExH.hpp index 41f05a56f5b..c54290c4cb2 100644 --- a/TAO/CIAO/CCF/CCF/CompilerElements/ExH.hpp +++ b/TAO/CIAO/CCF/CCF/CompilerElements/ExH.hpp @@ -1,12 +1,11 @@ // file : CCF/CompilerElements/ExH.hpp // author : Boris Kolpackov <boris@dre.vanderbilt.edu> +// cvs-id : $id$ // cvs-id : $Id$ #ifndef CCF_RUNTIME_EX_H_H #define CCF_RUNTIME_EX_H_H -#include "MSVC_Pragmas.hpp" - #include "Utility/ExH/ExH.hpp" namespace ExH = Utility::ExH; diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/FileSystem.hpp b/TAO/CIAO/CCF/CCF/CompilerElements/FileSystem.hpp index e42c7a3d213..1c8ef5246f5 100644 --- a/TAO/CIAO/CCF/CCF/CompilerElements/FileSystem.hpp +++ b/TAO/CIAO/CCF/CCF/CompilerElements/FileSystem.hpp @@ -1,12 +1,11 @@ // file : CCF/CompilerElements/FileSystem.hpp // author : Boris Kolpackov <boris@dre.vanderbilt.edu> +// cvs-id : $id$ // cvs-id : $Id$ #ifndef CCF_RUNTIME_FILE_SYSTEM_HPP #define CCF_RUNTIME_FILE_SYSTEM_HPP -#include "MSVC_Pragmas.hpp" - #include <boost/filesystem/path.hpp> #include <boost/filesystem/fstream.hpp> #include <boost/filesystem/exception.hpp> diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.hpp b/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.hpp index cefbed2da46..0a7af779634 100644 --- a/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.hpp +++ b/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.hpp @@ -1,6 +1,8 @@ #ifndef CCF_PREPROCESSOR_HPP #define CCF_PREPROCESSOR_HPP +#include <deque> + #include "CCF/CompilerElements/TokenStream.hpp" namespace CCF diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/ReferenceCounting.hpp b/TAO/CIAO/CCF/CCF/CompilerElements/ReferenceCounting.hpp index 231b3b1b51d..f64d009ac6c 100644 --- a/TAO/CIAO/CCF/CCF/CompilerElements/ReferenceCounting.hpp +++ b/TAO/CIAO/CCF/CCF/CompilerElements/ReferenceCounting.hpp @@ -1,12 +1,11 @@ // file : CCF/CompilerElements/ReferenceCounting.hpp // author : Boris Kolpackov <boris@dre.vanderbilt.edu> +// cvs-id : $id$ // cvs-id : $Id$ #ifndef CCF_RUNTIME_REFERENCE_COUNTING_H #define CCF_RUNTIME_REFERENCE_COUNTING_H -#include "MSVC_Pragmas.hpp" - #include "Utility/ReferenceCounting/ReferenceCounting.hpp" namespace ReferenceCounting = Utility::ReferenceCounting; diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/TokenStream.hpp b/TAO/CIAO/CCF/CCF/CompilerElements/TokenStream.hpp index a157cfeb71b..27e5c40d6c7 100644 --- a/TAO/CIAO/CCF/CCF/CompilerElements/TokenStream.hpp +++ b/TAO/CIAO/CCF/CCF/CompilerElements/TokenStream.hpp @@ -19,10 +19,17 @@ namespace CCF class TokenStream<char> { public: - typedef std::char_traits<char> traits; + typedef + std::char_traits<char> + traits; - typedef traits::int_type int_type; - typedef traits::char_type char_type; + typedef + traits::int_type + int_type; + + typedef + traits::char_type + char_type; public: virtual int_type diff --git a/TAO/CIAO/CCF/Version b/TAO/CIAO/CCF/Version index 7bcd0e3612d..7dea76edb3d 100644 --- a/TAO/CIAO/CCF/Version +++ b/TAO/CIAO/CCF/Version @@ -1 +1 @@ -0.0.2
\ No newline at end of file +1.0.1 |