Skip to content

Add KeywordString to SynConst. #11482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 29, 2021
Merged

Add KeywordString to SynConst. #11482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
756e980
Add KeywordString to SynConst.
nojaf Apr 24, 2021
94adf14
Renamed KeywordString to SourceIdentifier.
nojaf Apr 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/fsharp/CheckExpressions.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,8 @@ let TcConst cenv ty m env c =
| SynConst.Measure(SynConst.UInt64 i, _, _) when expandedMeasurablesEnabled -> unifyMeasureArg (i=0UL) cenv.g.puint64_tcr c; Const.UInt64 i
| SynConst.Measure(SynConst.UIntPtr i, _, _) when expandedMeasurablesEnabled -> unifyMeasureArg (i=0UL) cenv.g.punativeint_tcr c; Const.UIntPtr i
| SynConst.Char c -> unif cenv.g.char_ty; Const.Char c
| SynConst.String (s, _, _) -> unif cenv.g.string_ty; Const.String s
| SynConst.String (s, _, _)
| SynConst.SourceIdentifier (_, s, _) -> unif cenv.g.string_ty; Const.String s
| SynConst.UserNum _ -> error (InternalError(FSComp.SR.tcUnexpectedBigRationalConstant(), m))
| SynConst.Measure _ -> error (Error(FSComp.SR.tcInvalidTypeForUnitsOfMeasure(), m))
| SynConst.UInt16s _ -> error (InternalError(FSComp.SR.tcUnexpectedConstUint16Array(), m))
Expand Down
6 changes: 5 additions & 1 deletion src/fsharp/SyntaxTree.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,14 @@ type SynConst =
| UInt16s of uint16[]

| Measure of constant: SynConst * constantRange: Range * SynMeasure

| SourceIdentifier of constant: string * value: string * range: Range

member c.Range dflt =
match c with
| SynConst.String (_, _, m0) | SynConst.Bytes (_, _, m0) -> m0
| SynConst.String (_, _, m0)
| SynConst.Bytes (_, _, m0)
| SynConst.SourceIdentifier(_, _, m0) -> m0
| _ -> dflt

[<NoEquality; NoComparison; RequireQualifiedAccess>]
Expand Down
4 changes: 4 additions & 0 deletions src/fsharp/SyntaxTree.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,10 @@ type SynConst =

/// Old comment: "we never iterate, so the const here is not another SynConst.Measure"
| Measure of constant: SynConst * constantRange: range * SynMeasure

/// Source Line, File, and Path Identifiers
/// Containing both the original value as the evaluated value.
| SourceIdentifier of constant: string * value: string * range: Range

/// Gets the syntax range of this construct
member Range: dflt: range -> range
Expand Down
6 changes: 3 additions & 3 deletions src/fsharp/lexhelp.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,11 +396,11 @@ module Keywords =

if String.IsNullOrEmpty dirname then dirname
else PathMap.applyDir args.pathMap dirname
|> KEYWORD_STRING
|> fun dir -> KEYWORD_STRING(s, dir)
| "__SOURCE_FILE__" ->
KEYWORD_STRING (System.IO.Path.GetFileName((FileIndex.fileOfFileIndex lexbuf.StartPos.FileIndex)))
KEYWORD_STRING (s, System.IO.Path.GetFileName((FileIndex.fileOfFileIndex lexbuf.StartPos.FileIndex)))
| "__LINE__" ->
KEYWORD_STRING (string lexbuf.StartPos.Line)
KEYWORD_STRING (s, string lexbuf.StartPos.Line)
| _ ->
IdentifierToken args lexbuf s

Expand Down
20 changes: 13 additions & 7 deletions src/fsharp/pars.fsy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ let rangeOfLongIdent(lid:LongIdent) =
%token <string * ParseHelpers.LexerContinuation> INTERP_STRING_END
%token <ParseHelpers.LexerContinuation> LBRACE RBRACE

%token <string> KEYWORD_STRING // Like __SOURCE_DIRECTORY__
%token <string * string> KEYWORD_STRING // Like __SOURCE_DIRECTORY__
%token <string> IDENT
%token <string> HASH_IDENT
%token <string> INFIX_STAR_STAR_OP
Expand Down Expand Up @@ -646,7 +646,7 @@ hashDirectiveArgs:

/* One argument to a #directive */
hashDirectiveArg:
| stringOrKeywordString
| string
{ let s, _ = $1
s }

Expand Down Expand Up @@ -2214,7 +2214,7 @@ tyconDefnOrSpfnSimpleRepr:
SynTypeDefnSimpleRepr.Record ($2, $3, lhs parseState) }

/* An inline-assembly type definition, for FSharp.Core library only */
| opt_attributes opt_declVisibility LPAREN HASH stringOrKeywordString HASH rparen
| opt_attributes opt_declVisibility LPAREN HASH string HASH rparen
{ if not (isNil $1) then errorR(Error(FSComp.SR.parsAttributesIllegalHere(), rhs parseState 1))
let lhsm = lhs parseState
libraryOnlyError lhsm
Expand Down Expand Up @@ -2922,10 +2922,14 @@ rawConstant:
| BIGNUM
{ SynConst.UserNum $1 }

| stringOrKeywordString
| string
{ let s, synStringKind = $1
SynConst.String (s, synStringKind, lhs parseState) }

| sourceIdentifier
{ let c,v = $1
SynConst.SourceIdentifier (c, v, lhs parseState) }

| BYTEARRAY
{ let (v, synByteStringKind, _) = $1
SynConst.Bytes (v, synByteStringKind, lhs parseState) }
Expand Down Expand Up @@ -4518,7 +4522,7 @@ forLoopDirection:
| DOWNTO { false }

inlineAssemblyExpr:
| HASH stringOrKeywordString opt_inlineAssemblyTypeArg optCurriedArgExprs optInlineAssemblyReturnTypes HASH
| HASH string opt_inlineAssemblyTypeArg optCurriedArgExprs optInlineAssemblyReturnTypes HASH
{ libraryOnlyWarning (lhs parseState)
let (s, _), sm = $2, rhs parseState 2
(fun m ->
Expand Down Expand Up @@ -5556,11 +5560,13 @@ colonOrEquals:
| EQUALS { }

/* A literal string or a string from a keyword like __SOURCE_FILE__ */
stringOrKeywordString:
string:
| STRING
{ let (s, synStringKind, _) = $1
s, synStringKind }
| KEYWORD_STRING { $1, SynStringKind.Regular }

sourceIdentifier:
| KEYWORD_STRING { $1 }

interpolatedStringFill:
| declExpr
Expand Down
11 changes: 11 additions & 0 deletions tests/FSharp.Compiler.Service.Tests/SurfaceArea.netstandard.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5788,6 +5788,12 @@ FSharp.Compiler.Syntax.SynConst+SByte: SByte Item
FSharp.Compiler.Syntax.SynConst+SByte: SByte get_Item()
FSharp.Compiler.Syntax.SynConst+Single: Single Item
FSharp.Compiler.Syntax.SynConst+Single: Single get_Item()
FSharp.Compiler.Syntax.SynConst+SourceIdentifier: FSharp.Compiler.Text.Range get_range()
FSharp.Compiler.Syntax.SynConst+SourceIdentifier: FSharp.Compiler.Text.Range range
FSharp.Compiler.Syntax.SynConst+SourceIdentifier: System.String constant
FSharp.Compiler.Syntax.SynConst+SourceIdentifier: System.String get_constant()
FSharp.Compiler.Syntax.SynConst+SourceIdentifier: System.String get_value()
FSharp.Compiler.Syntax.SynConst+SourceIdentifier: System.String value
FSharp.Compiler.Syntax.SynConst+String: FSharp.Compiler.Syntax.SynStringKind get_synStringKind()
FSharp.Compiler.Syntax.SynConst+String: FSharp.Compiler.Syntax.SynStringKind synStringKind
FSharp.Compiler.Syntax.SynConst+String: FSharp.Compiler.Text.Range get_range()
Expand All @@ -5807,6 +5813,7 @@ FSharp.Compiler.Syntax.SynConst+Tags: Int32 IntPtr
FSharp.Compiler.Syntax.SynConst+Tags: Int32 Measure
FSharp.Compiler.Syntax.SynConst+Tags: Int32 SByte
FSharp.Compiler.Syntax.SynConst+Tags: Int32 Single
FSharp.Compiler.Syntax.SynConst+Tags: Int32 SourceIdentifier
FSharp.Compiler.Syntax.SynConst+Tags: Int32 String
FSharp.Compiler.Syntax.SynConst+Tags: Int32 UInt16
FSharp.Compiler.Syntax.SynConst+Tags: Int32 UInt16s
Expand Down Expand Up @@ -5842,6 +5849,7 @@ FSharp.Compiler.Syntax.SynConst: Boolean IsIntPtr
FSharp.Compiler.Syntax.SynConst: Boolean IsMeasure
FSharp.Compiler.Syntax.SynConst: Boolean IsSByte
FSharp.Compiler.Syntax.SynConst: Boolean IsSingle
FSharp.Compiler.Syntax.SynConst: Boolean IsSourceIdentifier
FSharp.Compiler.Syntax.SynConst: Boolean IsString
FSharp.Compiler.Syntax.SynConst: Boolean IsUInt16
FSharp.Compiler.Syntax.SynConst: Boolean IsUInt16s
Expand All @@ -5863,6 +5871,7 @@ FSharp.Compiler.Syntax.SynConst: Boolean get_IsIntPtr()
FSharp.Compiler.Syntax.SynConst: Boolean get_IsMeasure()
FSharp.Compiler.Syntax.SynConst: Boolean get_IsSByte()
FSharp.Compiler.Syntax.SynConst: Boolean get_IsSingle()
FSharp.Compiler.Syntax.SynConst: Boolean get_IsSourceIdentifier()
FSharp.Compiler.Syntax.SynConst: Boolean get_IsString()
FSharp.Compiler.Syntax.SynConst: Boolean get_IsUInt16()
FSharp.Compiler.Syntax.SynConst: Boolean get_IsUInt16s()
Expand All @@ -5884,6 +5893,7 @@ FSharp.Compiler.Syntax.SynConst: FSharp.Compiler.Syntax.SynConst NewIntPtr(Int64
FSharp.Compiler.Syntax.SynConst: FSharp.Compiler.Syntax.SynConst NewMeasure(FSharp.Compiler.Syntax.SynConst, FSharp.Compiler.Text.Range, FSharp.Compiler.Syntax.SynMeasure)
FSharp.Compiler.Syntax.SynConst: FSharp.Compiler.Syntax.SynConst NewSByte(SByte)
FSharp.Compiler.Syntax.SynConst: FSharp.Compiler.Syntax.SynConst NewSingle(Single)
FSharp.Compiler.Syntax.SynConst: FSharp.Compiler.Syntax.SynConst NewSourceIdentifier(System.String, System.String, FSharp.Compiler.Text.Range)
FSharp.Compiler.Syntax.SynConst: FSharp.Compiler.Syntax.SynConst NewString(System.String, FSharp.Compiler.Syntax.SynStringKind, FSharp.Compiler.Text.Range)
FSharp.Compiler.Syntax.SynConst: FSharp.Compiler.Syntax.SynConst NewUInt16(UInt16)
FSharp.Compiler.Syntax.SynConst: FSharp.Compiler.Syntax.SynConst NewUInt16s(UInt16[])
Expand All @@ -5906,6 +5916,7 @@ FSharp.Compiler.Syntax.SynConst: FSharp.Compiler.Syntax.SynConst+IntPtr
FSharp.Compiler.Syntax.SynConst: FSharp.Compiler.Syntax.SynConst+Measure
FSharp.Compiler.Syntax.SynConst: FSharp.Compiler.Syntax.SynConst+SByte
FSharp.Compiler.Syntax.SynConst: FSharp.Compiler.Syntax.SynConst+Single
FSharp.Compiler.Syntax.SynConst: FSharp.Compiler.Syntax.SynConst+SourceIdentifier
FSharp.Compiler.Syntax.SynConst: FSharp.Compiler.Syntax.SynConst+String
FSharp.Compiler.Syntax.SynConst: FSharp.Compiler.Syntax.SynConst+Tags
FSharp.Compiler.Syntax.SynConst: FSharp.Compiler.Syntax.SynConst+UInt16
Expand Down
43 changes: 43 additions & 0 deletions tests/service/Symbols.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,4 +764,47 @@ with
]) ])) ->
assertRange (6, 2) (6, 21) range
assertRange (6, 2) (6, 21) clause.Range
| _ -> Assert.Fail "Could not get valid AST"

module SourceIdentifiers =
[<Test>]
let ``__LINE__`` () =
let parseResults =
getParseResults
"""
__LINE__"""

match parseResults with
| ParsedInput.ImplFile (ParsedImplFileInput (modules = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
SynModuleDecl.DoExpr(expr = SynExpr.Const(SynConst.SourceIdentifier("__LINE__", "2", range), _))
]) ])) ->
assertRange (2, 0) (2, 8) range
| _ -> Assert.Fail "Could not get valid AST"

[<Test>]
let ``__SOURCE_DIRECTORY__`` () =
let parseResults =
getParseResults
"""
__SOURCE_DIRECTORY__"""

match parseResults with
| ParsedInput.ImplFile (ParsedImplFileInput (modules = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
SynModuleDecl.DoExpr(expr = SynExpr.Const(SynConst.SourceIdentifier("__SOURCE_DIRECTORY__", _, range), _))
]) ])) ->
assertRange (2, 0) (2, 20) range
| _ -> Assert.Fail "Could not get valid AST"

[<Test>]
let ``__SOURCE_FILE__`` () =
let parseResults =
getParseResults
"""
__SOURCE_FILE__"""

match parseResults with
| ParsedInput.ImplFile (ParsedImplFileInput (modules = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
SynModuleDecl.DoExpr(expr = SynExpr.Const(SynConst.SourceIdentifier("__SOURCE_FILE__", _, range), _))
]) ])) ->
assertRange (2, 0) (2, 15) range
| _ -> Assert.Fail "Could not get valid AST"