From 17c5a98328f3a51ed540736b48e8525865e6e92e Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sun, 29 Jul 2012 23:02:18 +0200 Subject: [PATCH] Whitespace --- src/iooper.h | 86 ++++++++++++++++++++++++------------------------ src/stringoper.h | 71 ++++++++++++++++++++------------------- 2 files changed, 78 insertions(+), 79 deletions(-) diff --git a/src/iooper.h b/src/iooper.h index 8565a92..a934ac5 100644 --- a/src/iooper.h +++ b/src/iooper.h @@ -1,6 +1,6 @@ -/** @file */ -//////////////////////////////////////////////////////////////////////////////////////// -// +/** @file */ +//////////////////////////////////////////////////////////////////////////////////////// +// // This file is part of Boost Statechart Viewer. // // Boost Statechart Viewer is free software: you can redistribute it and/or modify @@ -30,11 +30,11 @@ using namespace std; * This class provides saving information about state machine to a specified output file. It saves states and transitions and also it creates the transition table. */ class IO_operations -{ +{ list transitions; /** list of transitions */ list states; /** list of states */ list events; /** list of events */ - string outputFilename; + string outputFilename; string name_of_machine; string name_of_first_state; string *table; /** transition table. It is being allocated when starting the creation of output file. */ @@ -50,7 +50,7 @@ class IO_operations if(model.compare(0,model.size(),table[i])==0) return i; } } - else + else { for(int i = 1;i events) /** Set list of events to an attribute */ { this->events = events; } - + void setTransitions(list transitions) /** Set list of transitions to an attribute */ { this->transitions = transitions; @@ -95,7 +95,7 @@ class IO_operations name_of_machine = name_of_FSM; } - void setNameOfFirstState(string first_state) /** Set name of start state to an attribute */ + void setNameOfFirstState(string first_state) /** Set name of start state to an attribute */ { name_of_first_state = first_state; } @@ -113,7 +113,7 @@ class IO_operations } return false; } - + bool write_states(ofstream& filestr) /** This method write states to the output file and also to transition table. */ { int pos1, pos2, cnt, subs, num_start, orto = 0; @@ -132,12 +132,12 @@ class IO_operations for(int i = 0;i<=cnt;i++) { if(i == cnt) sState[i] = str; - else + else { sState[i] = str.substr(0,str.find(',')); str = str.substr(str.find(',')+1); } - } + } for(list::iterator i = nstates.begin();i!=nstates.end();i++) // write all states in the context of the automaton { state = *i; @@ -147,19 +147,19 @@ class IO_operations orto = 1; if(cnt>1)cnt = 2; } - if(cnt==1) + if(cnt==1) { pos1 = state.find(","); - if(orto == 1) ctx = cut_namespaces(cut_namespaces(state.substr(pos1+1),1)); - else ctx = cut_namespaces(state.substr(pos1+1)); + if(orto == 1) ctx = cut_namespaces(cut_namespaces(state.substr(pos1+1),1)); + else ctx = cut_namespaces(state.substr(pos1+1)); if(ctx.compare(0,context.length(),context)==0 && context.length()==ctx.length()) { str = cut_namespaces(state.substr(0,pos1)); - if(test_start(sState,str,num_start)) + if(test_start(sState,str,num_start)) { filestr<::iterator i = nstates.begin();i!=nstates.end();i++) { @@ -222,11 +222,11 @@ class IO_operations { orto = 1; if(cnt>1)cnt = 2; - } + } if(cnt==1) { pos1 = state.find(","); - if(orto == 1) ctx = cut_namespaces(cut_namespaces(state.substr(pos1+1),1)); + if(orto == 1) ctx = cut_namespaces(cut_namespaces(state.substr(pos1+1),1)); else ctx = cut_namespaces(state.substr(pos1+1)); if(ctx.compare(0,context.length(),context)==0 && context.length()==ctx.length()) { @@ -256,7 +256,7 @@ class IO_operations { filestr<0) - { + { cout<1) + if(nbr>1) { table[i*cols+j] = str.substr(str.find(",")+1); multiline = 1; } else table[i*cols+j]=""; - + } - else + else { cout<') - { + { if(pos==0) break; else pos-=1; } @@ -249,11 +249,11 @@ int get_model(const string line) /** Test the string to has a specified model. * case 7 : if(str.compare(0,7,"transit")==0) return 6; break; case 8 : if(str.compare(0,8,"deferral")==0) return 13; - break; + break; case 10 : if(str.compare(0,10,"transition")==0) return 11; break; case 11 : if(str.compare(0,11,"defer_event")==0) return 7; - break; + break; case 13 : if(str.compare(0,13,"state_machine")==0) return 3; break; case 15 : if(str.compare(0,15,"custom_reaction")==0) return 12; @@ -269,18 +269,18 @@ string get_params(string line) /** Return parameters of the specified transition int pos_end = line.rfind(">"); return line.substr(pos_front,pos_end-pos_front); } - + string find_states(const CXXRecordDecl *cRecDecl, string line) /** test if the struct/class is he state (must be derived from simple_state or state). */ -{ +{ string super_class = get_super_class(line), base, params; if(cRecDecl->getNumBases()>1) { - + for(unsigned i = 0; igetNumBases();i++ ) { if(i!=cRecDecl->getNumBases()-1) base = get_first_base(super_class); else base = super_class; - if(is_state(super_class)) + if(is_state(super_class)) { params = get_params(super_class); } @@ -291,18 +291,18 @@ string find_states(const CXXRecordDecl *cRecDecl, string line) /** test if the s } } else - { - if(is_state(super_class)) - { + { + if(is_state(super_class)) + { params = get_params(super_class); } else params = ""; } return params; } - + string find_name_of_machine(const CXXRecordDecl *cRecDecl, string line) /** Find name of the state machine and the start state. */ -{ +{ string super_class = get_super_class(line), base, params; if(cRecDecl->getNumBases()>1) { @@ -321,7 +321,7 @@ string find_name_of_machine(const CXXRecordDecl *cRecDecl, string line) /** Find } } else - { + { if(get_model(super_class)==3) { params = get_params(super_class); @@ -331,9 +331,9 @@ string find_name_of_machine(const CXXRecordDecl *cRecDecl, string line) /** Find } string find_transitions (const string name_of_state, string line) /** Traverse all methods for finding declarations of transitions. */ -{ +{ string dest, params, base, trans; - int num = count(line,'<'); + int num = count(line,'<'); if(num>1) { num-=1; @@ -344,7 +344,7 @@ string find_transitions (const string name_of_state, string line) /** Traverse a } for(int j = 0;j10) { @@ -353,19 +353,19 @@ string find_transitions (const string name_of_state, string line) /** Traverse a else dest = ""; dest.append(name_of_state); params = get_params(base); - dest.append(","); + dest.append(","); dest.append(params); - trans.append(dest); + trans.append(dest); if(j!=num-1) trans.append(";"); } line = get_next_base(line); } if(trans[trans.length()-1]==';') return trans.substr(0,trans.length()-1); - else return trans; + else return trans; } bool find_events(const CXXRecordDecl *cRecDecl, string line) /** This function provides testing if the decl is decl of event*/ -{ +{ string super_class = get_super_class(line), base, params; if(cRecDecl->getNumBases()>1) { @@ -381,9 +381,8 @@ bool find_events(const CXXRecordDecl *cRecDecl, string line) /** This function p } } else - { + { if(get_model(super_class)==1)return true; } return false; } - -- 2.39.2