Commit Graph

128 Commits

Author SHA1 Message Date
Martin Atkins
305d5f96d1 json: update stale references to "zcl" 2018-01-27 11:03:05 -08:00
Martin Atkins
5a7ff3bca2 hclsyntax: rename our ragel scanner to "hcltok"
It was previously called "zcltok" after the prototype implementation that
HCL was forked from.
2018-01-27 11:03:05 -08:00
Martin Atkins
385f330d4f hclsyntax: update stale references to "zcl" in comments 2018-01-27 11:03:05 -08:00
Martin Atkins
a1c55afeca hclsyntax: \uxxxx and \Uxxxxxxxx escape sequences in string literals
These allow the inclusion of arbitrary unicode codepoints (always encoded
as UTF-8) using a hex representation.

\u expects four digits and can thus represent only characters in the basic
multilingual plane.

\U expects eight digits and can thus represent all unicode characters,
at the cost of being extra-verbose.

Since our parser properly accounts for unicode characters (including
combining sequences) it's recommended to include them literally (UTF-8
encoded) in source code, but these sequences are useful for explicitly
representing non-printable characters that could otherwise appear
invisible in source code, such as zero-width modifier characters.

This fixes #6.
2018-01-27 10:20:22 -08:00
Martin Atkins
f0bf2b15ae hclsyntax: permit tabs and treat them like spaces
We inherited a restriction from an early zcl prototype here, but it's
far too strict to prohibit tabs entirely and so we'll accept them and
just treat them as spaces for column-counting purposes.

Tabs are still not _advised_, since they add extra complexity for problems
like generating annotated source code snippets (can't necessarily know
how large the tab stop is going to be) or doing surgical updates to
existing source files. The canonical formatting applied by hclwrite's
Format function will still eliminate all tabs, imposing the canonical
style of two spaces per indent level.

This fixes #2.
2018-01-27 09:30:36 -08:00
Martin Atkins
88bf362f0c hclsyntax: update generators to use HCL package path
Since these have Go source code embedded in strings, they were not found
during the original big zcl to HCL rename.
2018-01-27 09:26:56 -08:00
Martin Atkins
678f7e6781 json: remove non-functional HIL parsing functions
An earlier iteration of this package was able to optionally use HIL as
its expression engine in place of the hclsyntax expression parser, but
this has since been removed and so this flag no longer has any effect.

Consequently, the public functions ParseWithHIL and ParseFileWithHIL were,
in fact, just using the zclsyntax parser and thus behaving identically to
the Parse and ParseFile functions.
2018-01-27 09:15:53 -08:00
Martin Atkins
34e27c038a hcl: UnwrapExpression and UnwrapExpressionUntil
A pattern has emerged of wrapping Expression instances with other
Expressions in order to subtly modify their behavior. A key example of
this is in ext/dynblock, where wrap an expression in order to introduce
our additional iteration variable for expressions in dynamic blocks.

Rather than having each wrapper expression implement wrapping
implementations for our various syntax-level-analysis functions (like
ExprList and AbsTraversalForExpr), instead we define a standard mechanism
to unwrap expressions back to the lowest-level object -- usually an AST
node -- and then use this in all of our analyses that look at the
expression's structure rather than its value.
2018-01-27 09:10:18 -08:00
Martin Atkins
60b539d5d7 integrationtest: include dynblock usage in the "terraformlike" test
Terraform is the prime use-case for the dynblock extension, so we'll
include this here currently as a proof-of-concept for Terraform's usage,
but eventually (once Terraform is actually using it) this'll give some
insurance that it doesn't get broken.
2018-01-27 09:10:18 -08:00
Fatih Arslan
f87600a7d9 update zclsyntax to hclsyntax in various comments and strings
These are remnants of the project HCL was forked from.
2018-01-23 21:54:38 -08:00
Martin Atkins
83451bb547 hcl/hclsyntax: correctly handle %{ sequence escapes
In early prototyping the template control sequence introducer was
specified as !{, but that changed to %{ along the way because it seemed
more intuitive and less likely to collide with literal strings.

However, the parser's string literal handling still had remnants of the
old syntax, causing strange quirks in parsing strings that contained
exclamation points.

Now we correctly expect %{ as the control sequence introducer, %%{ as its
escape sequence, and additionally fix a bug where previously template
sequence introduction characters at the end of a string literal would
be silently dropped due to them representing an unterminated escape
sequence.

This fixes #3.
2018-01-19 08:11:25 -08:00
Martin Atkins
0daeda39ff hcl/hclsyntax: return hcl.TraverseIndex, not pointer to one
Traversals are always passed by value, so returning a pointer here is
inconsistent with how hcl.TraverseIndex is used elsewhere and thus makes
life inconvenient for callers making type assertions.
2018-01-18 08:12:05 -08:00
Martin Atkins
883a81b490 hcl: highlight the subject when printing a diagnostic source snippet
In complex expressions it can be hard to determine which portion is
relevant when we print a diagnostic message. To address this, when color
is enabled we bold and underline the "subject" portion of the source code,
which then makes it stand out within the full lines of code we print
in the snippet.
2018-01-14 12:25:35 -08:00
Martin Atkins
14cfe59a52 hcl: Simplify the text DiagnosticWriter using new Range functions
Now that we have helper methods for computing relationships between
ranges, we can eliminate all of the tricky line-counting and byte-counting
code here and instead use the higher-level operations.

The result is a single loop using the RangeScanner.
2018-01-14 12:07:33 -08:00
Martin Atkins
368a3f81c0 hcl: SourceRange.PartitionAround
This is a convenience wrapper around SourceRange.Overlap that also
calculates the ranges in the receiver that _aren't_ overlapping with the
given range.

This is useful when, for example, partitioning a portion of source code
to insert markers to highlight the location of an error, as we do when
printing code snippets as part of diagnostic output.
2018-01-14 11:51:05 -08:00
Martin Atkins
1365a2cfe5 hcl: RangeOver function
This is a generalization of RangeBetween that finds a single range that
covers the full extent of both given ranges, possibly also including some
additional content between the ranges if they do not overlap.
2018-01-14 11:33:23 -08:00
Martin Atkins
d34d4686fb hcl: RangeScanner helper
RangeScanner has an interface similar to bufio.Scanner for partitioning
a buffer into tokens, but it returns the hcl.Range of each token along
with that token so that the caller can see where the token fits in
relation to the entire source file.

The main intended use-case for this is to partition a source file into
lines for the purpose of printing a source code snippet in diagnostic
output. Having the source location information is important in that case
to recognize which lines belong to the subject and context of each
diagnostic.
2018-01-14 11:24:19 -08:00
Martin Atkins
11e4972f13 hcl: Helper methods for detecting overlaps in ranges
This is useful, for example, when printing source snippets to the terminal
as part of diagnostics, in order to detect the portion of the source code
that coincides with the subject or context of each diagnostic.
2018-01-14 10:08:39 -08:00
Martin Atkins
600e8726ec hcl: Export the source range for a Traversal
This can be useful, for example, when using Expression.Variables to
pre-validate all of the referenced variables before evaluation, so that
the traversal source ranges can be included in any generated diagnostics.
2018-01-13 23:01:11 -08:00
Martin Atkins
f3af67f344 integrationtest: exercise some features Terraform uses
As an extra level of confidence in addition to the unit tests, this
integration test verifies that a certain set of features that Terraform
uses are able to work properly together.

Terraform is used as an example here just because it's a more advanced
consumer of HCL and thus it exercises some codepaths that most
applications don't need, such as ExprList and AbsTraversalForExpr.
2018-01-13 00:58:50 -08:00
Martin Atkins
76b0988d90 hcl/json: detect variable references in string values 2018-01-12 23:35:58 -08:00
Martin Atkins
77c855c5ed hcl: ExprList function
This helper allows a calling application to require a given expression be
some sort of list constructor (tuple constructor in native syntax, or
array in JSON) and peel off that outer level of list to obtain a slice
of the Expression objects inside.

This is useful in rare cases where the calling application needs to
extract the expressions within the list without evaluating the entire list
expression first. For example, the expressions that result from this
function might be passed into AbsTraversalForExpr in situations where the
caller requires a static list of static traversals that will never
actually be evaluated.
2018-01-12 23:30:41 -08:00
Martin Atkins
0949d55133 hcl: AbsTraversalForExpr and RelTraversalForExpr
These functions permit a calling application to recognize when an
expression represents a static absolute traversal and obtain that
traversal. This allows for the unusual-but-valid case where an application
wishes to access the expression source rather than its resulting value,
when the expression source is something that can be understood as a
traversal.

An example use-case is an attribute that takes a list of other attributes
it depends on, expressed as traversals. In this case the calling
application needs to access the attribute names themselves rather than
their values, e.g. to build some sort of dependency graph to gradually
populate the scope for evaluation.
2018-01-12 22:58:55 -08:00
Martin Atkins
339b9cfc34 hcl: StaticExpr function for making synthetic expressions
Sometimes we want an expression that just wraps a static value, e.g. for
testing or to provide a default value for a missing attribute.

StaticExpr gives us a convenient way to do that, returning a value that
implements the Expression interface by returning just the given static
value.
2017-09-20 16:22:05 -07:00
Martin Atkins
5956c82199 More miscellaneous renaming of ZCL to HCL. 2017-09-11 18:36:56 -07:00
Martin Atkins
46b20d40af Update doc comments and readmes for zcl -> HCL. 2017-09-11 16:56:31 -07:00
Martin Atkins
a3ec0f1156 specs: zcl -> HCL 2017-09-11 16:49:35 -07:00
Martin Atkins
708abb8c97 Move the zcl package and its two parsing subpackages to "hcl" names
This is a super-invasive update since the "zcl" package in particular
is referenced all over.

There are probably still a few zcl references hanging around in comments,
etc but this takes care of most of it.
2017-09-11 16:40:37 -07:00