Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

Commit

Permalink
[Merge chakra-core/ChakraCore@2e48b602dd] [MERGE #3554 @xiaoyinl] Fix…
Browse files Browse the repository at this point in the history
… typos

Merge pull request #3554 from xiaoyinl:typo

These typos are found using VSSpellChecker (https://github.com/EWSoftware/VSSpellChecker).
  • Loading branch information
chakrabot authored and kfarnung committed Jan 9, 2018
1 parent e016cd7 commit c10b885
Show file tree
Hide file tree
Showing 30 changed files with 50 additions and 50 deletions.
2 changes: 1 addition & 1 deletion deps/chakrashim/core/lib/Common/Common/NumberUtilities.inl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#define X_BYTE_ORDER BYTE_ORDER
#define X_LITTLE_ENDIAN LITTLE_ENDIAN
#else // BYTE_ORDER not defined
#error "Endiannes of this platform is undefined"
#error "Endianness of this platform is undefined"
#endif // __BYTE_ORDER

#if X_BYTE_ORDER == X_LITTLE_ENDIAN
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ RecyclerWriteBarrierManager::ToggleBarrier(void * address, size_t bytes, bool en
}
}

GlobalSwbVerboseTrace(_u("Enableing 0x%p (CIndex: %u-%u)\n"), address, startIndex, endIndex);
GlobalSwbVerboseTrace(_u("Enabling 0x%p (CIndex: %u-%u)\n"), address, startIndex, endIndex);
}
}

Expand Down
6 changes: 3 additions & 3 deletions deps/chakrashim/core/lib/Jsrt/ChakraCommon.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,11 @@ typedef unsigned short uint16_t;
/// </summary>
JsErrorPropertyNotString,
/// <summary>
/// Module evaulation is called in wrong context.
/// Module evaluation is called in wrong context.
/// </summary>
JsErrorInvalidContext,
/// <summary>
/// Module evaulation is called in wrong context.
/// Module evaluation is called in wrong context.
/// </summary>
JsInvalidModuleHostInfoKind,
/// <summary>
Expand Down Expand Up @@ -295,7 +295,7 @@ typedef unsigned short uint16_t;
/// </summary>
JsErrorDiagObjectNotFound,
/// <summary>
/// VM was unable to perfom the request action
/// VM was unable to perform the request action
/// </summary>
JsErrorDiagUnableToPerformAction,
} JsErrorCode;
Expand Down
8 changes: 4 additions & 4 deletions deps/chakrashim/core/lib/Jsrt/ChakraDebug.h
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ typedef unsigned __int32 uint32_t;
/// </summary>
/// <param name="attributes">The attributes of the runtime to be created.</param>
/// <param name="infoUri">The uri where the recorded Time-Travel data should be loaded from.</param>
/// <param name="enableDebugging">A flag to enable addtional debugging operation support during replay.</param>
/// <param name="enableDebugging">A flag to enable additional debugging operation support during replay.</param>
/// <param name="openResourceStream">The <c>TTDOpenResourceStreamCallback</c> function for generating a JsTTDStreamHandle to read/write serialized data.</param>
/// <param name="readBytesFromStream">The <c>JsTTDReadBytesFromStreamCallback</c> function for reading bytes from a JsTTDStreamHandle.</param>
/// <param name="flushAndCloseStream">The <c>JsTTDFlushAndCloseStreamCallback</c> function for flushing and closing a JsTTDStreamHandle as needed.</param>
Expand Down Expand Up @@ -823,7 +823,7 @@ typedef unsigned __int32 uint32_t;

/// <summary>
/// TTD API -- may change in future versions:
/// Notify the Js runtime we are at a safe yield point in the event loop (i.e. no locals on the stack and we can proccess as desired).
/// Notify the Js runtime we are at a safe yield point in the event loop (i.e. no locals on the stack and we can process as desired).
/// </summary>
/// <returns>The code <c>JsNoError</c> if the operation succeeded, a failure code otherwise.</returns>
CHAKRA_API
Expand Down Expand Up @@ -903,7 +903,7 @@ typedef unsigned __int32 uint32_t;

/// <summary>
/// TTD API -- may change in future versions:
/// A check for unimplmented TTD actions in the host.
/// A check for unimplemented TTD actions in the host.
/// This API is a TEMPORARY API while we complete the implementation of TTD support in the Node host and will be deleted once that is complete.
/// </summary>
/// <param name="msg">The message to print if we should be catching this as a TTD operation.</param>
Expand Down Expand Up @@ -963,7 +963,7 @@ typedef unsigned __int32 uint32_t;
/// <summary>
/// TTD API -- may change in future versions:
/// During debug operations some additional information is populated during replay. This runs the code between the given
/// snapshots to poulate this information which may be needed by the debugger to determine time-travel jump targets.
/// snapshots to populate this information which may be needed by the debugger to determine time-travel jump targets.
/// </summary>
/// <param name="runtimeHandle">The runtime handle that the script is executing in.</param>
///<param name = "startSnapTime">The snapshot time that we will start executing from.< / param>
Expand Down
2 changes: 1 addition & 1 deletion deps/chakrashim/core/lib/Jsrt/JsrtDebugManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ Js::BreakpointProbe* JsrtDebugManager::SetBreakpointHelper_TTD(int64 desiredBpId
// Don't see a use case for supporting multiple breakpoints at same location.
// If a breakpoint already exists, just return that
Js::BreakpointProbe* probe = debugDocument->FindBreakpoint(statement);
TTDAssert(probe == nullptr || desiredBpId == -1, "We shouldn't be resetting this BP unless it was cleared eariler!");
TTDAssert(probe == nullptr || desiredBpId == -1, "We shouldn't be resetting this BP unless it was cleared earlier!");

if(probe == nullptr)
{
Expand Down
2 changes: 1 addition & 1 deletion deps/chakrashim/core/lib/Parser/rterrors.h
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ RT_ERROR_MSG(WASMERR_TableIndexOutOfRange, 7016, "", "Table index is out of rang
RT_ERROR_MSG(WASMERR_ArrayIndexOutOfRange, 7017, "", "Memory index is out of range", kjstWebAssemblyRuntimeError, 0)
RT_ERROR_MSG(WASMERR_InvalidInstantiateArgument, 7018, "", "Invalid arguments to instantiate", kjstTypeError, 0)
RT_ERROR_MSG(WASMERR_WasmLinkError, 7019, "%s", "Linking failed.", kjstWebAssemblyLinkError, 0)
RT_ERROR_MSG(WASMERR_NeedResponse, 7020, "%s is not a Reponse", "Response expected", kjstTypeError, 0)
RT_ERROR_MSG(WASMERR_NeedResponse, 7020, "%s is not a Response", "Response expected", kjstTypeError, 0)
RT_ERROR_MSG(WASMERR_CantDetach, 7021, "", "Not allowed to detach WebAssembly.Memory buffer", kjstTypeError, 0)
RT_ERROR_MSG(WASMERR_BufferGrowOnly, 7022, "", "WebAssembly.Memory can only grow", kjstTypeError, 0)
RT_ERROR_MSG(WASMERR_LinkSignatureMismatch, 7023, "Cannot link import %s in link table due to a signature mismatch", "Function called with invalid signature", kjstWebAssemblyRuntimeError, 0)
Expand Down
2 changes: 1 addition & 1 deletion deps/chakrashim/core/lib/Runtime/Base/jitprofiling.h
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ unsigned int JITAPI iJIT_GetNewMethodID(void);
iJIT_IsProfilingActiveFlags JITAPI iJIT_IsProfilingActive(void);

/**
* @brief Reports infomation about JIT-compiled code to the agent.
* @brief Reports information about JIT-compiled code to the agent.
*
* The reported information is used to attribute samples obtained from any
* Intel(R) VTune(TM) Amplifier collector. This API needs to be called
Expand Down
12 changes: 6 additions & 6 deletions deps/chakrashim/core/lib/Runtime/Debug/TTEventLog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1760,13 +1760,13 @@ namespace TTD
}
catch(const Js::JavascriptException& err)
{
TTDAssert(NSLogEvents::EventCompletesWithException(evt), "Should see same execption here");
TTDAssert(NSLogEvents::EventCompletesWithException(evt), "Should see same exception here");

ctx->GetThreadContext()->SetRecordedException(err.GetAndClear());
}
catch(Js::ScriptAbortException)
{
TTDAssert(NSLogEvents::EventCompletesWithException(evt), "Should see same execption here");
TTDAssert(NSLogEvents::EventCompletesWithException(evt), "Should see same exception here");

Assert(ctx->GetThreadContext()->GetRecordedException() == nullptr);
ctx->GetThreadContext()->SetRecordedException(ctx->GetThreadContext()->GetPendingTerminatedErrorObject());
Expand Down Expand Up @@ -1799,14 +1799,14 @@ namespace TTD
}
catch(const Js::JavascriptException& err)
{
TTDAssert(NSLogEvents::EventCompletesWithException(evt), "Should see same execption here");
TTDAssert(NSLogEvents::EventCompletesWithException(evt), "Should see same exception here");

TTDAssert(false, "Should never get JavascriptExceptionObject for ContextAPINoScriptWrapper.");
ctx->GetThreadContext()->SetRecordedException(err.GetAndClear());
}
catch(Js::ScriptAbortException)
{
TTDAssert(NSLogEvents::EventCompletesWithException(evt), "Should see same execption here");
TTDAssert(NSLogEvents::EventCompletesWithException(evt), "Should see same exception here");

Assert(ctx->GetThreadContext()->GetRecordedException() == nullptr);
ctx->GetThreadContext()->SetRecordedException(ctx->GetThreadContext()->GetPendingTerminatedErrorObject());
Expand Down Expand Up @@ -2728,9 +2728,9 @@ namespace TTD
bool diagEnabled = reader.ReadBool(NSTokens::Key::diagEnabled, true);

#if ENABLE_TTD_INTERNAL_DIAGNOSTICS
TTDAssert(diagEnabled, "Diag was enabled in record so it shoud be in replay as well!!!");
TTDAssert(diagEnabled, "Diag was enabled in record so it should be in replay as well!!!");
#else
TTDAssert(!diagEnabled, "Diag was *not* enabled in record so it shoud *not* be in replay either!!!");
TTDAssert(!diagEnabled, "Diag was *not* enabled in record so it should *not* be in replay either!!!");
#endif

reader.ReadUInt64(NSTokens::Key::usedMemory, true);
Expand Down
4 changes: 2 additions & 2 deletions deps/chakrashim/core/lib/Runtime/Debug/TTEventLog.h
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ namespace TTD
template <typename T, NSLogEvents::EventKind tag>
NSLogEvents::EventLogEntry* RecordGetInitializedEvent(T** extraData)
{
AssertMsg(TTD_EVENT_PLUS_DATA_SIZE_DIRECT(sizeof(T)) == this->m_eventListVTable[(uint32)tag].DataSize, "Computed and extracted data sizes dont' match!!!");
AssertMsg(TTD_EVENT_PLUS_DATA_SIZE_DIRECT(sizeof(T)) == this->m_eventListVTable[(uint32)tag].DataSize, "Computed and extracted data sizes don't match!!!");

NSLogEvents::EventLogEntry* res = this->m_eventList.GetNextAvailableEntry<T>();
NSLogEvents::EventLogEntry_Initialize<tag>(res, this->GetCurrentEventTimeAndAdvance());
Expand All @@ -288,7 +288,7 @@ namespace TTD
template <typename T, NSLogEvents::EventKind tag>
T* RecordGetInitializedEvent_DataOnly()
{
AssertMsg(TTD_EVENT_PLUS_DATA_SIZE_DIRECT(sizeof(T)) == this->m_eventListVTable[(uint32)tag].DataSize, "Computed and extracted data sizes dont' match!!!");
AssertMsg(TTD_EVENT_PLUS_DATA_SIZE_DIRECT(sizeof(T)) == this->m_eventListVTable[(uint32)tag].DataSize, "Computed and extracted data sizes don't match!!!");

NSLogEvents::EventLogEntry* res = this->m_eventList.GetNextAvailableEntry<T>();
NSLogEvents::EventLogEntry_Initialize<tag>(res, this->GetCurrentEventTimeAndAdvance());
Expand Down
2 changes: 1 addition & 1 deletion deps/chakrashim/core/lib/Runtime/Debug/TTSerialize.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1699,7 +1699,7 @@ namespace TTD
{
uint32 wlen = 0;
this->ReadBytesInto_Fixed<uint32>(wlen);
TTDAssert(wlen == length, "Not exepcted string length!!!");
TTDAssert(wlen == length, "Not expected string length!!!");

this->ReadBytesInto((byte*)code, length * sizeof(char16));
}
Expand Down
4 changes: 2 additions & 2 deletions deps/chakrashim/core/lib/Runtime/Debug/TTSupport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@ namespace TTD

TTDMode TTModeStack::Peek() const
{
TTDAssert(this->m_stackTop > 0, "Undeflow in stack pop.");
TTDAssert(this->m_stackTop > 0, "Underflow in stack pop.");

return this->m_stackEntries[this->m_stackTop - 1];
}

void TTModeStack::Pop()
{
TTDAssert(this->m_stackTop > 0, "Undeflow in stack pop.");
TTDAssert(this->m_stackTop > 0, "Underflow in stack pop.");

this->m_stackTop--;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ DynamicProfileStorage::Load(char16 const * filename, Fn loadFn)
#if DBG_DUMP
if (DynamicProfileStorage::DoTrace())
{
Output::Print(_u("TRACE: DynamicProfileStorage: Faile to load from cache dir for '%s'"), filename);
Output::Print(_u("TRACE: DynamicProfileStorage: Failed to load from cache dir for '%s'"), filename);
Output::Flush();
}
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@ namespace Js
JavascriptExceptionOperators::Throw(childModule->errorObject, GetScriptContext());
}

// if ambigious, return "ambigious"
// if ambiguous, return "ambiguous"
if (!childModule->ResolveExport(exportName, resolveSet, &currentResolution))
{
ambiguousResolution = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ namespace Js

this->Map([&](RecyclableObject* key, Js::Var value)
{
AssertMsg(smi->MapSize + 1 < mapCountEst, "We are writting junk");
AssertMsg(smi->MapSize + 1 < mapCountEst, "We are writing junk");

smi->MapKeyValueArray[smi->MapSize] = key;
smi->MapKeyValueArray[smi->MapSize + 1] = value;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ namespace Js

this->Map([&](RecyclableObject* key)
{
AssertMsg(ssi->SetSize < setCountEst, "We are writting junk");
AssertMsg(ssi->SetSize < setCountEst, "We are writing junk");

ssi->SetValueArray[ssi->SetSize] = key;
ssi->SetSize++;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ void Js::WebAssemblyEnvironment::SetVarElement(Field(Var)* ptr, T* val, uint32 i

Field(Var)* dst = ptr + index;
CheckPtrIsValid<Var>((intptr_t)dst);
AssertMsg(*(T**)dst == nullptr, "We shouln't overwrite anything on the environment once it is set");
AssertMsg(*(T**)dst == nullptr, "We shouldn't overwrite anything on the environment once it is set");
*dst = val;
}

Expand Down Expand Up @@ -145,7 +145,7 @@ void WebAssemblyEnvironment::SetGlobalInternal(uint32 offset, T val)
{
Field(T)* ptr = (Field(T)*)PointerValue(start) + offset;
CheckPtrIsValid<T>((intptr_t)PointerValue(ptr));
AssertMsg(*ptr == 0, "We shouln't overwrite anything on the environment once it is set");
AssertMsg(*ptr == 0, "We shouldn't overwrite anything on the environment once it is set");
*ptr = val;
}

Expand Down
2 changes: 1 addition & 1 deletion deps/chakrashim/core/lib/wabt/src/validator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@ Result Validator::CheckModule(const Module* module) {
}

// Returns the result type of the invoked function, checked by the caller;
// returning nullptr means that another error occured first, so the result type
// returning nullptr means that another error occurred first, so the result type
// should be ignored.
const TypeVector* Validator::CheckInvoke(const Action* action) {
const ActionInvoke* invoke = action->invoke;
Expand Down
4 changes: 2 additions & 2 deletions deps/chakrashim/core/pal/src/cruntime/printf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -437,11 +437,11 @@ PAL_fwprintf(
Function:
Internal_ScanfExtractFormatA
Paramaters:
Parameters:
Fmt
- format string to parse
- first character must be a '%'
- paramater gets updated to point to the character after
- parameter gets updated to point to the character after
the %<foo> format string
Out
- buffer will contain the %<foo> format string
Expand Down
8 changes: 4 additions & 4 deletions deps/chakrashim/core/pal/src/cruntime/printfcpp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,16 +110,16 @@ static int Internal_Convertfwrite(CPalThread *pthrCurrent, const void *buffer, s
Function:
Internal_ExtractFormatA
Paramaters:
Parameters:
Fmt
- format string to parse
- first character must be a '%'
- paramater gets updated to point to the character after
- parameter gets updated to point to the character after
the %<foo> format string
Out
- buffer will contain the %<foo> format string
Flags
- paramater will be set with the PRINTF_FORMAT_FLAGS defined above
- parameter will be set with the PRINTF_FORMAT_FLAGS defined above
Width
- will contain the width specified by the format string
- -1 if none given
Expand All @@ -136,7 +136,7 @@ static int Internal_Convertfwrite(CPalThread *pthrCurrent, const void *buffer, s
- %#10x, when we have a width greater than the length (i.e padding) the
length of the padding is not consistent with MS's wsprintf
(MS adds an extra 2 padding chars, length of "0x")
- MS's wsprintf seems to ingore a 'h' prefix for number types
- MS's wsprintf seems to ignore a 'h' prefix for number types
- MS's "%p" is different than gcc's
e.g. printf("%p", NULL);
MS --> 00000000
Expand Down
4 changes: 2 additions & 2 deletions deps/chakrashim/core/pal/src/cruntime/wchar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1131,7 +1131,7 @@ PAL_wcscat(

ret = PAL_wcsncat( strDestination, strSource, PAL_wcslen( strSource ) );

LOGEXIT("wcscat returnng char16_t %p (%S)\n", ret, ret);
LOGEXIT("wcscat returning char16_t %p (%S)\n", ret, ret);
PERF_EXIT(wcscat);
return ret;
}
Expand Down Expand Up @@ -1829,7 +1829,7 @@ PAL_iswdigit( char16_t c )
}
else
{
TRACE( "No corresonding unicode record for character %d.\n", c );
TRACE( "No corresponding unicode record for character %d.\n", c );
}
#endif /* HAVE_COREFOUNDATION */
LOGEXIT("PAL_iswdigit returning %d\n", nRetVal);
Expand Down
2 changes: 1 addition & 1 deletion deps/chakrashim/core/pal/src/file/filetime.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ Function
FileTimeToSystemTime()
Helper function for FileTimeToDosTime.
Converts the necessary file time attibutes to system time, for
Converts the necessary file time attributes to system time, for
easier manipulation in FileTimeToDosTime.
--*/
Expand Down
2 changes: 1 addition & 1 deletion deps/chakrashim/core/pal/src/objmgr/shmobject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ CSharedMemoryObject::Initialize(

InitializeExit:

LOGEXIT("CSharedMemoryObject::Initalize returns %d\n", palError);
LOGEXIT("CSharedMemoryObject::Initialize returns %d\n", palError);

return palError;
}
Expand Down
2 changes: 1 addition & 1 deletion deps/chakrashim/core/pal/src/objmgr/shmobjectmanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1151,7 +1151,7 @@ CSharedMemoryObjectManager::ImportSharedObjectIntoProcess(
}
else
{
ERROR("Unable to alllocate new object\n");
ERROR("Unable to allocate new object\n");
palError = ERROR_OUTOFMEMORY;
goto ImportSharedObjectIntoProcessExit;
}
Expand Down
2 changes: 1 addition & 1 deletion deps/chakrashim/core/pal/src/safecrt/input.inl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* and then includes this file in order to implement _cscanf().
*
*Note:
* this file is included in safecrt.lib build directly, plese refer
* this file is included in safecrt.lib build directly, please refer
* to safecrt_[w]input_s.c
*
*******************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion deps/chakrashim/core/pal/src/safecrt/mbusafecrt.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//

/***
* mbusafecrt.c - implementaion of support functions and data for MBUSafeCRT
* mbusafecrt.c - implementation of support functions and data for MBUSafeCRT
*
*
Expand Down
6 changes: 3 additions & 3 deletions deps/chakrashim/core/pal/src/safecrt/output.inl
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
*Purpose:
* This file contains the code that does all the work for the
* printf family of functions. It should not be called directly, only
* by the *printf functions. We don't make any assumtions about the
* by the *printf functions. We don't make any assumptions about the
* sizes of ints, longs, shorts, or long doubles, but if types do overlap,
* we also try to be efficient. We do assume that pointers are the same
* size as either ints or longs.
* If CPRFLAG is defined, defines _cprintf instead.
* **** DOESN'T CURRENTLY DO MTHREAD LOCKING ****
*
*Note:
* this file is included in safecrt.lib build directly, plese refer
* this file is included in safecrt.lib build directly, please refer
* to safecrt_[w]output_s.c
*
*******************************************************************************/
Expand Down Expand Up @@ -677,7 +677,7 @@ _CRTIMP int __cdecl _tcprintf_s (
* The format string is parsed by using a finite state automaton
* based on the current state and the current character read from
* the format string. Thus, looping is on a per-character basis,
* not a per conversion specifier basis. Once the format specififying
* not a per conversion specifier basis. Once the format specifying
* character is read, output is performed.
*
*Entry:
Expand Down
2 changes: 1 addition & 1 deletion deps/chakrashim/core/pal/src/safecrt/vswprint.c
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ int __cdecl _vsnwprintf_s (
* data
*
*Purpose:
* Counts the number of characters in the fotmatted data.
* Counts the number of characters in the formatted data.
*
*Entry:
* char16_t *format - format string, describes format of data
Expand Down
Loading

0 comments on commit c10b885

Please sign in to comment.