Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/devel
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27884/10.3/unstable/main/finkinfo/devel
Added Files:
astyle.patch
Log Message:
Guess y'all'll be wanting the patchfile, huh?
--- NEW FILE: astyle.patch ---
diff -Nurd -x'*~' astyle.orig/astyle_main.cpp astyle/astyle_main.cpp
--- astyle.orig/astyle_main.cpp 2002-03-07 08:22:30.000000000 -0500
+++ astyle/astyle_main.cpp 2006-01-17 23:24:36.000000000 -0500
@@ -151,47 +151,6 @@
-template<class ITER>
-bool parseOptions(ASFormatter &formatter,
- const ITER &optionsBegin,
- const ITER &optionsEnd,
- const string &errorInfo)
-{
- ITER option;
- bool ok = true;
- string arg, subArg;
-
- for (option = optionsBegin; option != optionsEnd; ++option)
- {
- arg = *option; //string(*option);
-
- if (arg.COMPARE(0, 2, string("--")) == 0)
- ok &= parseOption(formatter, arg.substr(2), errorInfo);
- else if (arg[0] == '-')
- {
- int i;
-
- for (i=1; i < arg.length(); ++i)
- {
- if (isalpha(arg[i]) && i > 1)
- {
- ok &= parseOption(formatter, subArg, errorInfo);
- subArg = "";
- }
- subArg.append(1, arg[i]);
- }
- ok &= parseOption(formatter, subArg, errorInfo);
- subArg = "";
- }
- else
- {
- ok &= parseOption(formatter, arg, errorInfo);
- subArg = "";
- }
- }
-
- return ok;
-}
void manuallySetJavaStyle(ASFormatter &formatter)
{
@@ -425,6 +384,47 @@
return true; //o.k.
}
+template<class ITER>
+bool parseOptions(ASFormatter &formatter,
+ const ITER &optionsBegin,
+ const ITER &optionsEnd,
+ const string &errorInfo)
+{
+ ITER option;
+ bool ok = true;
+ string arg, subArg;
+
+ for (option = optionsBegin; option != optionsEnd; ++option)
+ {
+ arg = *option; //string(*option);
+
+ if (arg.COMPARE(0, 2, string("--")) == 0)
+ ok &= parseOption(formatter, arg.substr(2), errorInfo);
+ else if (arg[0] == '-')
+ {
+ int i;
+
+ for (i=1; i < arg.length(); ++i)
+ {
+ if (isalpha(arg[i]) && i > 1)
+ {
+ ok &= parseOption(formatter, subArg, errorInfo);
+ subArg = "";
+ }
+ subArg.append(1, arg[i]);
+ }
+ ok &= parseOption(formatter, subArg, errorInfo);
+ subArg = "";
+ }
+ else
+ {
+ ok &= parseOption(formatter, arg, errorInfo);
+ subArg = "";
+ }
+ }
+
+ return ok;
+}
void importOptions(istream &in, vector<string> &optionsVector)
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
