diff --git a/decode_test.go b/decode_test.go index 0364b0bb..65029d6b 100644 --- a/decode_test.go +++ b/decode_test.go @@ -1485,7 +1485,7 @@ func (s *S) TestMergeNestedStruct(c *C) { // // Quick summary of the fields: // - // - A must come from outer and not overriden + // - A must come from outer and not overridden // - B must not be set as its in the ignored merge // - C should still be set as it's preset in the value // - D should be set from the recursive merge diff --git a/scannerc.go b/scannerc.go index ca007010..7edd31d8 100644 --- a/scannerc.go +++ b/scannerc.go @@ -97,7 +97,7 @@ import ( // %TAG !yaml! tag:yaml.org,2002: // --- // -// The correspoding sequence of tokens: +// The corresponding sequence of tokens: // // STREAM-START(utf-8) // VERSION-DIRECTIVE(1,1) @@ -300,7 +300,7 @@ import ( // The tokens BLOCK-SEQUENCE-START and BLOCK-MAPPING-START denote indentation // increase that precedes a block collection (cf. the INDENT token in Python). // The token BLOCK-END denote indentation decrease that ends a block collection -// (cf. the DEDENT token in Python). However YAML has some syntax pecularities +// (cf. the DEDENT token in Python). However YAML has some syntax peculiarities // that makes detections of these tokens more complex. // // The tokens BLOCK-ENTRY, KEY, and VALUE are used to represent the indicators @@ -1332,7 +1332,7 @@ func yaml_parser_fetch_key(parser *yaml_parser_t) bool { // In the block context, additional checks are required. if parser.flow_level == 0 { - // Check if we are allowed to start a new key (not nessesary simple). + // Check if we are allowed to start a new key (not necessary simple). if !parser.simple_key_allowed { return yaml_parser_set_scanner_error(parser, "", parser.mark, "mapping keys are not allowed in this context") @@ -2563,7 +2563,7 @@ func yaml_parser_scan_flow_scalar(parser *yaml_parser_t, token *yaml_token_t, si for k := 0; k < code_length; k++ { if !is_hex(parser.buffer, parser.buffer_pos+k) { yaml_parser_set_scanner_error(parser, "while parsing a quoted scalar", - start_mark, "did not find expected hexdecimal number") + start_mark, "did not find expected hexadecimal number") return false } value = (value << 4) + as_hex(parser.buffer, parser.buffer_pos+k) diff --git a/yaml.go b/yaml.go index 8cec6da4..bc7d2556 100644 --- a/yaml.go +++ b/yaml.go @@ -347,9 +347,9 @@ const ( // control over the content being decoded or encoded. // // It's worth noting that although Node offers access into details such as -// line numbers, colums, and comments, the content when re-encoded will not +// line numbers, columns, and comments, the content when re-encoded will not // have its original textual representation preserved. An effort is made to -// render the data plesantly, and to preserve comments near the data they +// render the data pleasantly, and to preserve comments near the data they // describe, though. // // Values that make use of the Node type interact with the yaml package in the @@ -375,7 +375,7 @@ type Node struct { // scalar nodes may be obtained via the ShortTag and LongTag methods. Kind Kind - // Style allows customizing the apperance of the node in the tree. + // Style allows customizing the appearance of the node in the tree. Style Style // Tag holds the YAML tag defining the data type for the value. @@ -387,7 +387,7 @@ type Node struct { // the implicit tag diverges from the provided one. Tag string - // Value holds the unescaped and unquoted represenation of the value. + // Value holds the unescaped and unquoted representation of the value. Value string // Anchor holds the anchor name for this node, which allows aliases to point to it. diff --git a/yamlh.go b/yamlh.go index 7c6d0077..b9a9e55d 100644 --- a/yamlh.go +++ b/yamlh.go @@ -774,7 +774,7 @@ type yaml_emitter_t struct { scalar_data struct { value []byte // The scalar value. multiline bool // Does the scalar contain line breaks? - flow_plain_allowed bool // Can the scalar be expessed in the flow plain style? + flow_plain_allowed bool // Can the scalar be expressed in the flow plain style? block_plain_allowed bool // Can the scalar be expressed in the block plain style? single_quoted_allowed bool // Can the scalar be expressed in the single quoted style? block_allowed bool // Can the scalar be expressed in the literal or folded styles?