Fixed typos.

diff --git a/src/njs_disassembler.c b/src/njs_disassembler.c
index 25d3067936fecbd8c22a074e86beb4e5722d6e1e..0588805c76b15972fcf42657ab4e1dae365f69f3 100644 (file)
--- a/src/njs_disassembler.c
+++ b/src/njs_disassembler.c
@@ -88,8 +88,8 @@ static njs_code_name_t  code_names[] = {
 
     { NJS_VMCODE_ADDITION, sizeof(njs_vmcode_3addr_t),
           njs_str("ADD             ") },
-    { NJS_VMCODE_SUBSTRACTION, sizeof(njs_vmcode_3addr_t),
-          njs_str("SUBSTRACT       ") },
+    { NJS_VMCODE_SUBTRACTION, sizeof(njs_vmcode_3addr_t),
+          njs_str("SUBTRACT        ") },
     { NJS_VMCODE_MULTIPLICATION, sizeof(njs_vmcode_3addr_t),
           njs_str("MULTIPLY        ") },
     { NJS_VMCODE_EXPONENTIATION, sizeof(njs_vmcode_3addr_t),

diff --git a/src/njs_generator.c b/src/njs_generator.c
index 2364a3ddb5320896b0ec29cf9e794abe0246743e..f08b33fe2df55d39dc42b1c889bd291af2fa7342 100644 (file)
--- a/src/njs_generator.c
+++ b/src/njs_generator.c
@@ -616,7 +616,7 @@ njs_generate(njs_vm_t *vm, njs_generator_t *generator, njs_parser_node_t *node)
     case NJS_TOKEN_RIGHT_SHIFT_ASSIGNMENT:
     case NJS_TOKEN_UNSIGNED_RIGHT_SHIFT_ASSIGNMENT:
     case NJS_TOKEN_ADDITION_ASSIGNMENT:
-    case NJS_TOKEN_SUBSTRACTION_ASSIGNMENT:
+    case NJS_TOKEN_SUBTRACTION_ASSIGNMENT:
     case NJS_TOKEN_MULTIPLICATION_ASSIGNMENT:
     case NJS_TOKEN_EXPONENTIATION_ASSIGNMENT:
     case NJS_TOKEN_DIVISION_ASSIGNMENT:
@@ -639,7 +639,7 @@ njs_generate(njs_vm_t *vm, njs_generator_t *generator, njs_parser_node_t *node)
     case NJS_TOKEN_RIGHT_SHIFT:
     case NJS_TOKEN_UNSIGNED_RIGHT_SHIFT:
     case NJS_TOKEN_ADDITION:
-    case NJS_TOKEN_SUBSTRACTION:
+    case NJS_TOKEN_SUBTRACTION:
     case NJS_TOKEN_MULTIPLICATION:
     case NJS_TOKEN_EXPONENTIATION:
     case NJS_TOKEN_DIVISION:

diff --git a/src/njs_lexer.c b/src/njs_lexer.c
index d44d26e7996a222eaf55d03dbd1c0dd984f4549d..53ae46e2a695ae792ff66014bd4b3f6353eea361 100644 (file)
--- a/src/njs_lexer.c
+++ b/src/njs_lexer.c
@@ -64,7 +64,7 @@ static const uint8_t  njs_tokens[256]  njs_aligned(64) = {
     /* & ' */   NJS_TOKEN_BITWISE_AND,       NJS_TOKEN_SINGLE_QUOTE,
     /* ( ) */   NJS_TOKEN_OPEN_PARENTHESIS,  NJS_TOKEN_CLOSE_PARENTHESIS,
     /* * + */   NJS_TOKEN_MULTIPLICATION,    NJS_TOKEN_ADDITION,
-    /* , - */   NJS_TOKEN_COMMA,             NJS_TOKEN_SUBSTRACTION,
+    /* , - */   NJS_TOKEN_COMMA,             NJS_TOKEN_SUBTRACTION,
     /* . / */   NJS_TOKEN_DOT,               NJS_TOKEN_DIVISION,
 
     /* 0 1 */   NJS_TOKEN_DIGIT,             NJS_TOKEN_DIGIT,
@@ -196,7 +196,7 @@ static const njs_lexer_multi_t  njs_addition_token[] = {
 
 static const njs_lexer_multi_t  njs_substraction_token[] = {
     { '-', NJS_TOKEN_DECREMENT, 0, NULL },
-    { '=', NJS_TOKEN_SUBSTRACTION_ASSIGNMENT, 0, NULL },
+    { '=', NJS_TOKEN_SUBTRACTION_ASSIGNMENT, 0, NULL },
 };
 
 
@@ -639,7 +639,7 @@ njs_lexer_make_token(njs_lexer_t *lexer, njs_lexer_token_t *token)
                         njs_nitems(njs_addition_token));
         break;
 
-    case NJS_TOKEN_SUBSTRACTION:
+    case NJS_TOKEN_SUBTRACTION:
         njs_lexer_multi(lexer, token, njs_substraction_token,
                         njs_nitems(njs_substraction_token));
         break;

diff --git a/src/njs_lexer.h b/src/njs_lexer.h
index f810551118e66d9d64c72e7527760953d3d7a26e..6b1d04b6afa6bdc762068e09b745c0277c843419 100644 (file)
--- a/src/njs_lexer.h
+++ b/src/njs_lexer.h
@@ -39,7 +39,7 @@ typedef enum {
     NJS_TOKEN_ASSIGNMENT,
     NJS_TOKEN_ARROW,
     NJS_TOKEN_ADDITION_ASSIGNMENT,
-    NJS_TOKEN_SUBSTRACTION_ASSIGNMENT,
+    NJS_TOKEN_SUBTRACTION_ASSIGNMENT,
     NJS_TOKEN_MULTIPLICATION_ASSIGNMENT,
     NJS_TOKEN_EXPONENTIATION_ASSIGNMENT,
     NJS_TOKEN_DIVISION_ASSIGNMENT,
@@ -66,7 +66,7 @@ typedef enum {
     NJS_TOKEN_ADDITION,
     NJS_TOKEN_UNARY_PLUS,
 
-    NJS_TOKEN_SUBSTRACTION,
+    NJS_TOKEN_SUBTRACTION,
     NJS_TOKEN_UNARY_NEGATION,
 
     NJS_TOKEN_MULTIPLICATION,

diff --git a/src/njs_object.c b/src/njs_object.c
index 7d9cb0953336c8bd47afc2149ff9652a35321031..24738708168cb3b90dab60038394d2be8fe96785 100644 (file)
--- a/src/njs_object.c
+++ b/src/njs_object.c
@@ -2098,7 +2098,7 @@ njs_object_prototype_create_constructor(njs_vm_t *vm, njs_object_prop_t *prop,
 
     if (setval != NULL) {
         if (!njs_is_object(value)) {
-            njs_type_error(vm, "Cannot create propery \"constructor\" on %s",
+            njs_type_error(vm, "Cannot create property \"constructor\" on %s",
                            njs_type_string(value->type));
             return NJS_ERROR;
         }

diff --git a/src/njs_parser.c b/src/njs_parser.c
index fa18e9e364f38d09a09283c99dc124ae82d4ac86..c05054fbe2996bb91bb760a04461926a764d9c06 100644 (file)
--- a/src/njs_parser.c
+++ b/src/njs_parser.c
@@ -3438,7 +3438,7 @@ njs_parser_unary_expression(njs_parser_t *parser, njs_lexer_token_t *token,
         operation = NJS_VMCODE_UNARY_PLUS;
         break;
 
-    case NJS_TOKEN_SUBSTRACTION:
+    case NJS_TOKEN_SUBTRACTION:
         type = NJS_TOKEN_UNARY_NEGATION;
         operation = NJS_VMCODE_UNARY_NEGATION;
         break;
@@ -3768,8 +3768,8 @@ njs_parser_additive_expression_match(njs_parser_t *parser,
         operation = NJS_VMCODE_ADDITION;
         break;
 
-    case NJS_TOKEN_SUBSTRACTION:
-        operation = NJS_VMCODE_SUBSTRACTION;
+    case NJS_TOKEN_SUBTRACTION:
+        operation = NJS_VMCODE_SUBTRACTION;
         break;
 
     default:
@@ -4438,9 +4438,9 @@ njs_parser_assignment_operator(njs_parser_t *parser, njs_lexer_token_t *token,
         operation = NJS_VMCODE_ADDITION;
         break;
 
-    case NJS_TOKEN_SUBSTRACTION_ASSIGNMENT:
+    case NJS_TOKEN_SUBTRACTION_ASSIGNMENT:
         njs_thread_log_debug("JS: -=");
-        operation = NJS_VMCODE_SUBSTRACTION;
+        operation = NJS_VMCODE_SUBTRACTION;
         break;
 
     case NJS_TOKEN_LEFT_SHIFT_ASSIGNMENT:
@@ -9337,7 +9337,7 @@ njs_parser_serialize_node(njs_chb_t *chain, njs_parser_node_t *node)
     njs_token_serialize(NJS_TOKEN_CONDITIONAL);
     njs_token_serialize(NJS_TOKEN_ASSIGNMENT);
     njs_token_serialize(NJS_TOKEN_ADDITION_ASSIGNMENT);
-    njs_token_serialize(NJS_TOKEN_SUBSTRACTION_ASSIGNMENT);
+    njs_token_serialize(NJS_TOKEN_SUBTRACTION_ASSIGNMENT);
     njs_token_serialize(NJS_TOKEN_MULTIPLICATION_ASSIGNMENT);
     njs_token_serialize(NJS_TOKEN_EXPONENTIATION_ASSIGNMENT);
     njs_token_serialize(NJS_TOKEN_DIVISION_ASSIGNMENT);
@@ -9356,7 +9356,7 @@ njs_parser_serialize_node(njs_chb_t *chain, njs_parser_node_t *node)
     njs_token_serialize(NJS_TOKEN_UNARY_PLUS);
     njs_token_serialize(NJS_TOKEN_INCREMENT);
     njs_token_serialize(NJS_TOKEN_POST_INCREMENT);
-    njs_token_serialize(NJS_TOKEN_SUBSTRACTION);
+    njs_token_serialize(NJS_TOKEN_SUBTRACTION);
     njs_token_serialize(NJS_TOKEN_UNARY_NEGATION);
     njs_token_serialize(NJS_TOKEN_DECREMENT);
     njs_token_serialize(NJS_TOKEN_POST_DECREMENT);

diff --git a/src/njs_vmcode.c b/src/njs_vmcode.c
index f8b57ed4c529c9db2efff8ecdeea14b95f25c74c..9181adb209182902ea74a47a9c821b2b5ec32d41 100644 (file)
--- a/src/njs_vmcode.c
+++ b/src/njs_vmcode.c
@@ -195,7 +195,7 @@ njs_vmcode_interpreter(njs_vm_t *vm, u_char *pc, void *promise_cap,
         NJS_GOTO_ROW(NJS_VMCODE_ADDITION),
         NJS_GOTO_ROW(NJS_VMCODE_EQUAL),
         NJS_GOTO_ROW(NJS_VMCODE_NOT_EQUAL),
-        NJS_GOTO_ROW(NJS_VMCODE_SUBSTRACTION),
+        NJS_GOTO_ROW(NJS_VMCODE_SUBTRACTION),
         NJS_GOTO_ROW(NJS_VMCODE_MULTIPLICATION),
         NJS_GOTO_ROW(NJS_VMCODE_EXPONENTIATION),
         NJS_GOTO_ROW(NJS_VMCODE_DIVISION),
@@ -712,7 +712,7 @@ NEXT_LBL;
         njs_vmcode_operand(vm, vmcode->operand1, retval);                     \
         pc += sizeof(njs_vmcode_3addr_t)
 
-    CASE (NJS_VMCODE_SUBSTRACTION):
+    CASE (NJS_VMCODE_SUBTRACTION):
         njs_vmcode_debug_opcode();
 
         njs_vmcode_operand(vm, vmcode->operand3, value2);

diff --git a/src/njs_vmcode.h b/src/njs_vmcode.h
index 9fe89f3c1250a55764b023978d819374f5e37c8a..a6071d3c78edddbcd366a80ce63bb11fac79fcc7 100644 (file)
--- a/src/njs_vmcode.h
+++ b/src/njs_vmcode.h
@@ -81,7 +81,7 @@ enum {
     NJS_VMCODE_ADDITION,
     NJS_VMCODE_EQUAL,
     NJS_VMCODE_NOT_EQUAL,
-    NJS_VMCODE_SUBSTRACTION,
+    NJS_VMCODE_SUBTRACTION,
     NJS_VMCODE_MULTIPLICATION,
     NJS_VMCODE_EXPONENTIATION,
     NJS_VMCODE_DIVISION,