Hi, this is next in series of typo fixing patches. I cleaned up http://kam.mff.cuni.cz/~ondra/gcc_misspells and fixed misspells for letters a-d. I combined this list with what I done previously and here is result.
I according to Joseph suggestion split it by directory. This is done with following two scripts. https://github.com/neleai/stylepp/tree/master/maintained/gcc/split_patch https://github.com/neleai/stylepp/tree/master/maintained/gcc/prepare_patch To simplify review I added stylepp_strip_diff tool. It takes a diff and displays them in compact way. Here you often fix same typo ten times which is much easier to check when you have them next to each other. - // Aquire info using the current info as template for matching + // Acquire info using the current info as template for matching ^^ -// that this MUST NOT aquire any Java lock, as this could result in +// that this MUST NOT acquire any Java lock, as this could result in ^^ t the thread's interrupted flag *after* aquiring its wait_mutex. This t the thread's interrupted flag *after* acquiring its wait_mutex. This ^^ - // allways on. You always want this as far as I can see, but it also + // always on. You always want this as far as I can see, but it also ^^ - next free colorcell, atleast in one of the passes. */ + next free colorcell, at least in one of the passes. */ ^ ^ -// Our solution is to keep a vector of candiate offsets in each interface +// Our solution is to keep a vector of candidate offsets in each interface ^ ^ "_0xXX". Class names containing such chracters are uncommon, but "_0xXX". Class names containing such characters are uncommon, but ^ ^ - /* the likelyhood of object, int, or void return is very high, + /* the likelihood of object, int, or void return is very high, ^ ^ all frames in the interpreted stack and occurances all frames in the interpreted stack and occurrences ^ ^ - // if everything proceeded sucessfully, we're loaded. + // if everything proceeded successfully, we're loaded. ^ ^ ncremented to point after the character thta gets returns. ncremented to point after the character that gets returns. ^ ^ diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 9cc34c5..517f17a 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,7 @@ +2013-07-23 Ondřej Bílka <nel...@seznam.cz> + + * class.c: Fix typos in java. + 2013-06-05 Jan Hubicka <j...@suse.cz> * class.c (emit_register_classes_in_jcr_section): Use DECL_PRESERVE_P diff --git a/gcc/java/class.c b/gcc/java/class.c index cb67896..62bda1f 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -314,7 +314,7 @@ mangled_classname (const char *prefix, tree type) result = identifier_subst (ident, prefix, '.', '_', ""); /* Replace any characters that aren't in the set [0-9a-zA-Z_$] with - "_0xXX". Class names containing such chracters are uncommon, but + "_0xXX". Class names containing such characters are uncommon, but they do sometimes occur in class files. Without this check, these names cause assembly errors. diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 23a6acc..b0c951a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,16 @@ +2013-07-23 Ondřej Bílka <nel...@seznam.cz> + + * defineclass.cc: Fix typos in java. + * gnu/gcj/runtime/natFinalizerThread.cc: Likewise. + * gnu/gcj/xlib/natColormap.cc: Likewise. + * gnu/gcj/xlib/natVisual.cc: Likewise. + * include/jvm.h: Likewise. + * interpret-run.cc: Likewise. + * java/lang/natVMClassLoader.cc: Likewise. + * link.cc: Likewise. + * posix-threads.cc: Likewise. + * stacktrace.cc: Likewise. + 2013-06-20 Roland Lutz <rl...@hedmen.org> * contrib/aot-compile.in: Fix typo in option list. diff --git a/libjava/defineclass.cc b/libjava/defineclass.cc index c7a32cc..3051444 100644 --- a/libjava/defineclass.cc +++ b/libjava/defineclass.cc @@ -81,7 +81,7 @@ struct _Jv_ClassReader // do verification? Currently, there is no option to disable this. // This flag just controls the verificaiton done by the class loader; // i.e., checking the integrity of the constant pool; and it is - // allways on. You always want this as far as I can see, but it also + // always on. You always want this as far as I can see, but it also // controls weither identifiers and type descriptors/signatures are // verified as legal. This could be somewhat more expensive since it // will call Character.isJavaIdentifier{Start,Part} for each character diff --git a/libjava/gnu/gcj/runtime/natFinalizerThread.cc b/libjava/gnu/gcj/runtime/natFinalizerThread.cc index ec1846b..b976616 100644 --- a/libjava/gnu/gcj/runtime/natFinalizerThread.cc +++ b/libjava/gnu/gcj/runtime/natFinalizerThread.cc @@ -30,7 +30,7 @@ gnu::gcj::runtime::FinalizerThread::init () // This is called by the GC when a finalizer is ready to be // run. It sets a flag and wakes up the finalizer thread. Note -// that this MUST NOT aquire any Java lock, as this could result in +// that this MUST NOT acquire any Java lock, as this could result in // the hash synchronization code being re-entered: the synchronization // code itself might need to allocate. See PR 16478. void diff --git a/libjava/gnu/gcj/xlib/natColormap.cc b/libjava/gnu/gcj/xlib/natColormap.cc index 2f6a6c7..e4ec158 100644 --- a/libjava/gnu/gcj/xlib/natColormap.cc +++ b/libjava/gnu/gcj/xlib/natColormap.cc @@ -115,7 +115,7 @@ xcolorarray gnu::gcj::xlib::Colormap::getXColors() backwards and forwards, and only pick out the colorcells that have been identified as shared during both passes. Reversing the traversal direction might prevent i from corresponding to the - next free colorcell, atleast in one of the passes. */ + next free colorcell, at least in one of the passes. */ for (unsigned int i=0; i<nCells; i++) { ::XColor color = colors[i]; diff --git a/libjava/gnu/gcj/xlib/natVisual.cc b/libjava/gnu/gcj/xlib/natVisual.cc index 56e03b5..35eb277 100644 --- a/libjava/gnu/gcj/xlib/natVisual.cc +++ b/libjava/gnu/gcj/xlib/natVisual.cc @@ -118,7 +118,7 @@ void gnu::gcj::xlib::Visual::ensureXVisualInfo(jint requiredMask) infoMask |= MASK_SCREEN; } - // Aquire info using the current info as template for matching + // Acquire info using the current info as template for matching ::Display* dpy = (::Display*) display->display; int visualInfoCount; diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h index ec74f29..5879932 100644 --- a/libjava/include/jvm.h +++ b/libjava/include/jvm.h @@ -124,7 +124,7 @@ union _Jv_value /* Extract a character from a Java-style Utf8 string. * PTR points to the current character. * LIMIT points to the end of the Utf8 string. - * PTR is incremented to point after the character thta gets returns. + * PTR is incremented to point after the character that gets returns. * On an error, -1 is returned. */ #define UTF8_GET(PTR, LIMIT) \ ((PTR) >= (LIMIT) ? -1 \ diff --git a/libjava/interpret-run.cc b/libjava/interpret-run.cc index a4c2d4d..474845b 100644 --- a/libjava/interpret-run.cc +++ b/libjava/interpret-run.cc @@ -615,7 +615,7 @@ details. */ int rtype = cif->rtype->type; - /* the likelyhood of object, int, or void return is very high, + /* the likelihood of object, int, or void return is very high, * so those are checked before the switch */ if (rtype == FFI_TYPE_POINTER) { diff --git a/libjava/java/lang/natVMClassLoader.cc b/libjava/java/lang/natVMClassLoader.cc index 4edff7d..f0acf99 100644 --- a/libjava/java/lang/natVMClassLoader.cc +++ b/libjava/java/lang/natVMClassLoader.cc @@ -95,7 +95,7 @@ java::lang::VMClassLoader::defineClass (java::lang::ClassLoader *loader, throw ex; } - // if everything proceeded sucessfully, we're loaded. + // if everything proceeded successfully, we're loaded. JvAssert (klass->state == JV_STATE_READ); } #endif // INTERPRETER diff --git a/libjava/link.cc b/libjava/link.cc index 2511408..e4ca4f9 100644 --- a/libjava/link.cc +++ b/libjava/link.cc @@ -983,7 +983,7 @@ static bool iindex_mutex_initialized = false; // (cast or instanceof) is the same problem: Once we have a possible Partial // Interface Dispatch Table, we just compare the first element to see if it // matches the desired interface. So how can we find the correct offset? -// Our solution is to keep a vector of candiate offsets in each interface +// Our solution is to keep a vector of candidate offsets in each interface // (ioffsets), and in each class we have an index (idt->iindex) used to // select the correct offset from ioffsets. // diff --git a/libjava/posix-threads.cc b/libjava/posix-threads.cc index 66693ab..0fe45de 100644 --- a/libjava/posix-threads.cc +++ b/libjava/posix-threads.cc @@ -327,7 +327,7 @@ _Jv_ThreadInterrupt (_Jv_Thread_t *data) { pthread_mutex_lock (&data->wait_mutex); - // Set the thread's interrupted flag *after* aquiring its wait_mutex. This + // Set the thread's interrupted flag *after* acquiring its wait_mutex. This // ensures that there are no races with the interrupt flag being set after // the waiting thread checks it and before pthread_cond_wait is entered. data->thread_obj->interrupt_flag = true; diff --git a/libjava/stacktrace.cc b/libjava/stacktrace.cc index d8d1f38..7bb6c87 100644 --- a/libjava/stacktrace.cc +++ b/libjava/stacktrace.cc @@ -122,7 +122,7 @@ _Jv_StackTrace::UnwindTraceFn (struct _Unwind_Context *context, void *state_ptr) // If we see the interpreter's main function, "pop" an entry off the // interpreter stack and use that instead, so that the trace goes through // the java code and not the interpreter itself. This assumes a 1:1 - // correspondance between call frames in the interpreted stack and occurances + // correspondance between call frames in the interpreted stack and occurrences // of _Jv_InterpMethod::run() on the native stack. #ifdef INTERPRETER void *interp_run = NULL;
