Cleaned Whitespace

Perltidied and Artistic Styled the code base. This was done according to JIRA 197. git-svn-id: https://svn.apache.org/repos/asf/incubator/lucy/trunk@1215523 13f79535-47bb-0310-9956-ffa450edef68
apache · Dec 17, 2011 · e21d2bc · e21d2bc
1 parent 903ebe8
commit e21d2bc
Show file tree

Hide file tree

Showing 51 changed files with 269 additions and 256 deletions.
diff --git a/c/src/liblucy.c b/c/src/liblucy.c
@@ -3,8 +3,7 @@
 
 int lucy_test();
 
-int lucy_test()
+int lucy_test() {
-{
     printf("charmony achieved!\n");
     printf("size of CHY_SIZEOF_INT=%d\n", CHY_SIZEOF_INT);
     return 1;

diff --git a/charmonizer/src/Charmonizer/Core/OperatingSystem.c b/charmonizer/src/Charmonizer/Core/OperatingSystem.c
@@ -171,7 +171,7 @@ OS_mkdir(const char *filepath) {
     #if (defined(SHELL_IS_POSIX) || defined (SHELL_IS_CMD_EXE))
     char *mkdir_command = "mkdir";
     #endif
-    unsigned size = strlen(mkdir_command) + 1 + strlen (filepath) + 1;
+    unsigned size = strlen(mkdir_command) + 1 + strlen(filepath) + 1;
     char *command = (char*)malloc(size);
     sprintf(command, "%s %s", mkdir_command, filepath);
     OS_run_quietly(command);
@@ -185,7 +185,7 @@ OS_rmdir(const char *filepath) {
     #elif defined(SHELL_IS_CMD_EXE)
     char *rmdir_command = "rmdir /q";
     #endif
-    unsigned size = strlen(rmdir_command) + 1 + strlen (filepath) + 1;
+    unsigned size = strlen(rmdir_command) + 1 + strlen(filepath) + 1;
     char *command = (char*)malloc(size);
     sprintf(command, "%s %s", rmdir_command, filepath);
     OS_run_quietly(command);

diff --git a/charmonizer/src/Charmonizer/Probe/LargeFiles.h b/charmonizer/src/Charmonizer/Probe/LargeFiles.h
@@ -39,15 +39,15 @@ extern "C" {
  * If off64_t or its equivalent is available, this will be defined:
  *
  * HAS_64BIT_OFFSET_TYPE
- * 
+ *
  * If 64-bit variants of fopen, ftell, and fseek are available, this will be
  * defined:
  *
  * HAS_64BIT_STDIO
- * 
+ *
  * If 64-bit variants of pread and lseek are available, then corresponding
  * symbols will be defined:
- * 
+ *
  * HAS_64BIT_PREAD
  * HAS_64BIT_LSEEK
  *

diff --git a/charmonizer/src/Charmonizer/Test.h b/charmonizer/src/Charmonizer/Test.h
@@ -58,28 +58,28 @@ void
 chaz_Test_plan(chaz_TestBatch *batch);
 
 #define CHAZ_TEST_OK(_expression, _message) \
-	chaz_Test_ok(chaz_Test_current, (_expression), (_message))
+    chaz_Test_ok(chaz_Test_current, (_expression), (_message))
 void
 chaz_Test_ok(chaz_TestBatch *batch, int expression, const char *message);
 
 #define CHAZ_TEST_STR_EQ(_got, _expected, _message) \
-	chaz_Test_str_eq(chaz_Test_current, (_got), (_expected), (_message))
+    chaz_Test_str_eq(chaz_Test_current, (_got), (_expected), (_message))
 void
 chaz_Test_str_eq(chaz_TestBatch *batch, const char *got,
                  const char *expected, const char *message);
 
 #define CHAZ_TEST_PASS(_message) \
-	chaz_Test_pass(chaz_Test_current, (_message))
+    chaz_Test_pass(chaz_Test_current, (_message))
 void
 chaz_Test_pass(chaz_TestBatch *batch, const char *message);
 
 #define CHAZ_TEST_FAIL(_message) \
-	chaz_Test_fail(chaz_Test_current, (_message))
+    chaz_Test_fail(chaz_Test_current, (_message))
 void
 chaz_Test_fail(chaz_TestBatch *batch, const char *message);
 
 #define CHAZ_TEST_LONG_EQ(_got, _expected, _message) \
-	chaz_Test_long_eq(chaz_Test_current, (_got), (_expected), (_message))
+    chaz_Test_long_eq(chaz_Test_current, (_got), (_expected), (_message))
 void
 chaz_Test_long_eq(chaz_TestBatch *batch, long got, long expected,
                   const char *message);

diff --git a/charmonizer/src/Charmonizer/Test/TestLargeFiles.c b/charmonizer/src/Charmonizer/Test/TestLargeFiles.c
@@ -50,7 +50,7 @@ S_check_sparse_files(void);
 
 /* Helper for check_sparse_files().
  */
-static chaz_bool_t 
+static chaz_bool_t
 S_test_sparse_file(long offset, struct stat *st);
 
 /* See if trying to write a 5 GB file in a subprocess bombs out.  If it
@@ -170,7 +170,7 @@ S_run_tests(void) {
     check_val = read(fd, &check_char, 1);
     LONG_EQ(check_val, 1, "read() after multiple lseek64 calls");
     LONG_EQ(check_char, 'X',
-                "read() correct data after multiple lseek64 calls");
+            "read() correct data after multiple lseek64 calls");
 #ifdef HAS_64BIT_PREAD
     check_char = 0;
     check_val = pread64(fd, &check_char, 1, gb4_plus);

diff --git a/clownfish/perl/buildlib/Clownfish/Build.pm b/clownfish/perl/buildlib/Clownfish/Build.pm
@@ -23,9 +23,9 @@ use File::Spec::Functions qw( catfile updir catdir );
 use Config;
 use Cwd qw( getcwd );
 
-my $base_dir       = catdir( updir(), updir() );
+my $base_dir = catdir( updir(), updir() );
-my $PPPORT_H_PATH  = catfile( updir(), qw( include ppport.h ) );
+my $PPPORT_H_PATH = catfile( updir(), qw( include ppport.h ) );
-my $LEMON_DIR      = catdir( $base_dir, 'lemon' );
+my $LEMON_DIR = catdir( $base_dir, 'lemon' );
 my $LEMON_EXE_PATH = catfile( $LEMON_DIR, "lemon$Config{_exe}" );
 my $CFC_SOURCE_DIR = catdir( updir(), 'src' );
 
@@ -124,8 +124,8 @@ sub ACTION_lemon {
     print "Building the Lemon parser generator...\n\n";
     $self->_run_make(
         dir  => $LEMON_DIR,
-        args => [], 
+        args => [],
-    );  
+    );
 }
 
 # Run all .y files through lemon.
@@ -160,7 +160,7 @@ sub ACTION_lexers {
         $h_file =~ s/\.l$/.h/ or die "no match";
         next
             if $self->up_to_date( [ $l_file, @$y_files ],
-                    [ $c_file, $h_file ] );
+            [ $c_file, $h_file ] );
         system( 'flex', '-o', $c_file, "--header-file=$h_file", $l_file )
             and die "flex failed";
     }

diff --git a/clownfish/perl/lib/Clownfish.pm b/clownfish/perl/lib/Clownfish.pm
@@ -50,7 +50,8 @@ BEGIN { XSLoader::load( 'Clownfish', '0.01' ) }
         # Verify that args came in pairs.
         if ( @_ % 2 ) {
             my ( $package, $filename, $line ) = caller(1);
-            $@ = "Parameter error: odd number of args at $filename line $line\n";
+            $@
+                = "Parameter error: odd number of args at $filename line $line\n";
             return 0;
         }
 
@@ -285,7 +286,7 @@ BEGIN { XSLoader::load( 'Clownfish', '0.01' ) }
         my ( $either, %args ) = @_;
         verify_args( \%new_PARAMS, %args ) or confess $@;
         confess "no subclassing allowed" unless $either eq __PACKAGE__;
-        my $variadic   = delete $args{variadic} || 0;
+        my $variadic = delete $args{variadic} || 0;
         return _new($variadic);
     }
 }

diff --git a/clownfish/perl/lib/Clownfish/Binding/Perl.pm b/clownfish/perl/lib/Clownfish/Binding/Perl.pm
@@ -182,7 +182,7 @@ sub write_bindings {
         next unless delete $has_methods{$class_name};
         my $class_binding
             = Clownfish::Binding::Perl::Class->singleton($class_name);
-        my @bound         = $class_binding->method_bindings;
+        my @bound = $class_binding->method_bindings;
         $generated_xs .= $_->xsub_def . "\n" for @bound;
         push @xsubs, @bound;
     }

diff --git a/clownfish/perl/lib/Clownfish/Binding/Perl/Class.pm b/clownfish/perl/lib/Clownfish/Binding/Perl/Class.pm
@@ -61,7 +61,8 @@ sub register {
     # Create Pod spec if needed.
     my $pod_spec;
     if ( $args{make_pod} ) {
-        $pod_spec = Clownfish::Binding::Perl::Pod->new( %{ $args{make_pod} } );
+        $pod_spec
+            = Clownfish::Binding::Perl::Pod->new( %{ $args{make_pod} } );
     }
 
     # Create object.
@@ -194,10 +195,10 @@ sub create_pod {
         $inheritance_pod = "=head1 INHERITANCE\n\n";
         $inheritance_pod .= $class->get_class_name;
         for my $ancestor (@ancestors) {
-            my $class_name = $ancestor->get_class_name;           
+            my $class_name = $ancestor->get_class_name;
             if ( __PACKAGE__->singleton($class_name) ) {
                 $inheritance_pod .= " isa L<$class_name>";
-            } 
+            }
             else {
                 $inheritance_pod .= " isa $class_name";
             }

diff --git a/clownfish/perl/t/100-type.t b/clownfish/perl/t/100-type.t
@@ -22,8 +22,8 @@ use Clownfish::Parcel;
 my $neato_parcel = Clownfish::Parcel->singleton( name => 'Neato' );
 
 my $type = Clownfish::Type->new( parcel => 'Neato', specifier => 'mytype_t' );
-is( ${ $type->get_parcel }, $$neato_parcel,
+is( ${ $type->get_parcel },
-    "constructor changes parcel name to Parcel singleton" );
+    $$neato_parcel, "constructor changes parcel name to Parcel singleton" );
 
 is( $type->to_c, '', "to_c()" );
 $type->set_c_string("mytype_t");

diff --git a/clownfish/perl/t/102-integer_type.t b/clownfish/perl/t/102-integer_type.t
@@ -57,7 +57,7 @@ for my $chy_specifier (@chy_specifiers) {
     isa_ok( $type, "Clownfish::Type" );
     ok( $type && $type->is_integer, "parsed const Type is_integer()" );
     ok( $type && $type->const,      "parsed const Type is const()" );
-    SKIP: {
+SKIP: {
         skip( "No way to catch parser exception at present", 1 );
         my $bogus = $chy_specifier . "oot_toot";
         ok( !$parser->parse($bogus),
@@ -73,7 +73,7 @@ for my $c_specifier (@c_specifiers) {
     isa_ok( $type, "Clownfish::Type" );
     ok( $type && $type->is_integer, "parsed const Type is_integer()" );
     ok( $type && $type->const,      "parsed const Type is const()" );
-    SKIP: {
+SKIP: {
         skip( "No way to catch parser exception at present", 1 );
         my $bogus = $c_specifier . "y";
         ok( !$parser->parse($bogus),

diff --git a/clownfish/perl/t/103-float_type.t b/clownfish/perl/t/103-float_type.t
@@ -38,7 +38,7 @@ for my $specifier (qw( float double)) {
     isa_ok( $type, "Clownfish::Type" );
     ok( $type && $type->is_floating, "parsed const specifier is_floating()" );
     ok( $type && $type->const,       "parsed const specifier is_floating()" );
-    SKIP: {
+SKIP: {
         skip( "No way to catch parser exception at present", 1 );
         my $bogus = $specifier . "y";
         ok( !$parser->parse($bogus),

diff --git a/clownfish/perl/t/106-va_list_type.t b/clownfish/perl/t/106-va_list_type.t
@@ -32,7 +32,6 @@ ok( $type && $type->is_va_list, "parse va_list" );
 SKIP: {
     skip( "No way to catch parser exception at present", 1 );
     ok( !$parser->parse('va_listable'),
-        "va_list_type_specifier guards against partial word matches"
+        "va_list_type_specifier guards against partial word matches" );
-    );
 }
 
diff --git a/clownfish/perl/t/107-arbitrary_type.t b/clownfish/perl/t/107-arbitrary_type.t
@@ -49,10 +49,9 @@ my $parser = Clownfish::Parser->new;
 for my $specifier (qw( foo_t Sort_compare_t )) {
     my $type = $parser->parse($specifier);
     ok( $type && $type->is_arbitrary, "arbitrary_type '$specifier'" );
-    SKIP: {
+SKIP: {
         skip( "Can't recover from bad specifier", 1 );
         ok( !$parser->parse( $specifier . "_y_p_e eep;" ),
-            "arbitrary_type_specifier guards against partial word matches"
+            "arbitrary_type_specifier guards against partial word matches" );
-        );
     }
 }
diff --git a/clownfish/perl/t/201-method.t b/clownfish/perl/t/201-method.t
@@ -55,8 +55,7 @@ ok( !$method->compatible($macro_sym_differs),
 ok( !$macro_sym_differs->compatible($method), "... reversed" );
 
 my $extra_param = Clownfish::Method->new( %args,
-    param_list =>
+    param_list => $parser->parse('(Foo *self, int32_t count = 0, int b)'), );
-        $parser->parse('(Foo *self, int32_t count = 0, int b)'), );
 ok( !$method->compatible($macro_sym_differs),
     "extra param spoils compatible()"
 );

diff --git a/clownfish/perl/t/301-param_list.t b/clownfish/perl/t/301-param_list.t
@@ -26,8 +26,7 @@ my $parser = Clownfish::Parser->new;
 $parser->parse('parcel Neato;')
     or die "failed to process parcel_definition";
 
-isa_ok( $parser->parse($_),
+isa_ok( $parser->parse($_), "Clownfish::Variable", "param_variable: $_" )
-    "Clownfish::Variable", "param_variable: $_" )
     for ( 'uint32_t baz', 'CharBuf *stuff', 'float **ptr', );
 
 my $param_list = $parser->parse("(Obj *self, int num)");

diff --git a/clownfish/src/CFCBindClass.c b/clownfish/src/CFCBindClass.c
@@ -93,7 +93,7 @@ static char*
 S_short_names(CFCBindClass *self);
 
 const static CFCMeta CFCBINDCLASS_META = {
-    "Clownfish::Binding::Core::Class", 
+    "Clownfish::Binding::Core::Class",
     sizeof(CFCBindClass),
     (CFCBase_destroy_t)CFCBindClass_destroy
 };

diff --git a/clownfish/src/CFCDumpable.c b/clownfish/src/CFCDumpable.c
@@ -131,7 +131,7 @@ S_make_method_obj(CFCClass *klass, const char *method_name) {
     else if (strcmp(method_name, "Load") == 0) {
         CFCType *dump_type = CFCType_new_object(0, cf_parcel, "Obj", 1);
         CFCVariable *dump_var = CFCVariable_new(cf_parcel, NULL, NULL,
-                                                NULL, "dump", dump_type, 
+                                                NULL, "dump", dump_type,
                                                 false);
         param_list = CFCParamList_new(false);
         CFCParamList_add_param(param_list, self_var, NULL);
@@ -315,7 +315,7 @@ S_process_dump_member(CFCClass *klass, CFCVariable *member, char *buf,
             "    Cfish_Hash_Store_Str(dump, \"%s\", %u, (cfish_Obj*)cfish_CB_newf(\"%%f64\", (double)self->%s));\n";
         char bool_pattern[] =
             "    Cfish_Hash_Store_Str(dump, \"%s\", %u, (cfish_Obj*)cfish_Bool_singleton(self->%s));\n";
-        const char *pattern; 
+        const char *pattern;
         if (strcmp(specifier, "bool_t") == 0
             || strcmp(specifier, "chy_bool_t") == 0
            ) {

diff --git a/clownfish/src/CFCParser.c b/clownfish/src/CFCParser.c
@@ -137,15 +137,13 @@ CFCParser_allocate(CFCParser *self, size_t size) {
 }
 
 void
-CFCParser_set_result(CFCParser *self, CFCBase *result)
+CFCParser_set_result(CFCParser *self, CFCBase *result) {
-{
     CFCBase_decref(self->result);
     self->result = CFCBase_incref(result);
 }
 
 void
-CFCParser_set_errors(CFCParser *self, int errors)
+CFCParser_set_errors(CFCParser *self, int errors) {
-{
     self->errors = errors;
 }
 

diff --git a/clownfish/src/CFCPerlClass.c b/clownfish/src/CFCPerlClass.c
@@ -49,7 +49,7 @@ const static CFCMeta CFCPERLCLASS_META = {
 };
 
 CFCPerlClass*
-CFCPerlClass_new(CFCParcel *parcel, const char *class_name, CFCClass *client, 
+CFCPerlClass_new(CFCParcel *parcel, const char *class_name, CFCClass *client,
                  const char *xs_code, CFCPerlPod *pod_spec) {
     CFCPerlClass *self = (CFCPerlClass*)CFCBase_allocate(&CFCPERLCLASS_META);
     return CFCPerlClass_init(self, parcel, class_name, client, xs_code,
@@ -92,7 +92,7 @@ CFCPerlClass_add_to_registry(CFCPerlClass *self) {
     if (registry_size == registry_cap) {
         size_t new_cap = registry_cap + 10;
         registry = (CFCPerlClass**)REALLOCATE(registry,
-                       (new_cap + 1) * sizeof(CFCPerlClass*));
+                                              (new_cap + 1) * sizeof(CFCPerlClass*));
         for (size_t i = registry_cap; i <= new_cap; i++) {
             registry[i] = NULL;
         }

diff --git a/clownfish/src/CFCPerlConstructor.c b/clownfish/src/CFCPerlConstructor.c
@@ -125,7 +125,7 @@ CFCPerlConstructor_xsub_def(CFCPerlConstructor *self) {
         }
     }
 
-    const char pattern[] = 
+    const char pattern[] =
         "XS(%s);\n"
         "XS(%s) {\n"
         "    dXSARGS;\n"