GitLab

Alan Zimmerman pushed to branch wip/az/ghc-cpp at Glasgow Haskell Compiler / GHC

Commits:

91564daf

by Matthew Pickering at 2025-04-24T00:29:02-04:00

ghci: Use loadInterfaceForModule rather than loadSrcInterface in mkTopLevEnv

loadSrcInterface takes a user given `ModuleName` and resolves it to the
module which needs to be loaded (taking into account module
renaming/visibility etc).

loadInterfaceForModule takes a specific module and loads it.

The modules in `ImpDeclSpec` have already been resolved to the actual
module to get the information from during renaming. Therefore we just
need to fetch the precise interface from disk (and not attempt to rename
it again).

Fixes #25951

2e0c07ab
by Simon Peyton Jones at 2025-04-24T00:29:43-04:00
```
Test for #23298
```

0eef99b0

by Sven Tennie at 2025-04-24T07:34:36-04:00

RV64: Introduce J instruction (non-local jumps) and don't deallocate stack slots for J_TBL (#25738)

J_TBL result in local jumps, there should not deallocate stack slots
(see Note [extra spill slots].)

J is for non-local jumps, these may need to deallocate stack slots.

1bd3d13e

by fendor at 2025-04-24T07:35:17-04:00

Add `UnitId` to `EvalBreakpoint`

The `EvalBreakpoint` is used to communicate that a breakpoint was
encountered during code evaluation.
This `EvalBreakpoint` needs to be converted to an `InternalBreakpointId`
which stores a `Module` to uniquely find the correct `Module` in the
Home Package Table.

The `EvalBreakpoint` used to store only a `ModuleName` which is then
converted to a `Module` based on the currently active home unit.
This is incorrect in the face of multiple home units, the break point
could be in an entirely other home unit!
To fix this, we additionally store the `UnitId` of the `Module` in
`EvalBreakpoint` to later reconstruct the correct `Module`

All of the changes are the consequence of extending `EvalBreakpoint`
with the additional `ShortByteString` of the `UnitId`.

For performance reasons, we store the `ShortByteString` backing the
`UnitId` directly, avoiding marshalling overhead.

0fc630f6

by Alan Zimmerman at 2025-04-24T18:16:55+01:00

GHC-CPP: first rough proof of concept

Processes

     #define FOO
     #ifdef FOO
     x = 1
     #endif

Into

    [ITcppIgnored [L loc ITcppDefine]
    ,ITcppIgnored [L loc ITcppIfdef]
    ,ITvarid "x"
    ,ITequal
    ,ITinteger (IL {il_text = SourceText "1", il_neg = False, il_value = 1})
    ,ITcppIgnored [L loc ITcppEndif]
    ,ITeof]

In time, ITcppIgnored will be pushed into a comment

7b9e88bc

by Alan Zimmerman at 2025-04-24T18:16:55+01:00

Tidy up before re-visiting the continuation mechanic

3122938c

by Alan Zimmerman at 2025-04-24T18:16:55+01:00

Switch preprocessor to continuation passing style

Proof of concept, needs tidying up

681bef59
by Alan Zimmerman at 2025-04-24T18:16:55+01:00
```
Small cleanup
```
b440e634
by Alan Zimmerman at 2025-04-24T18:16:55+01:00
```
Get rid of some cruft
```

2b346c2a

by Alan Zimmerman at 2025-04-24T18:16:56+01:00

Starting to integrate.

Need to get the pragma recognised and set

6abe3815

by Alan Zimmerman at 2025-04-24T18:16:56+01:00

Make cppTokens extend to end of line, and process CPP comments

d31157a8
by Alan Zimmerman at 2025-04-24T18:16:56+01:00
```
Remove unused ITcppDefined
```

639208c3

by Alan Zimmerman at 2025-04-24T18:16:56+01:00

Allow spaces between # and keyword for preprocessor directive

854374dc

by Alan Zimmerman at 2025-04-24T18:16:56+01:00

Process CPP continuation lines

They are emited as separate ITcppContinue tokens.
Perhaps the processing should be more like a comment, and keep on
going to the end.
BUT, the last line needs to be slurped as a whole.

04450a85

by Alan Zimmerman at 2025-04-24T18:16:56+01:00

Accumulate CPP continuations, process when ready

Can be simplified further, we only need one CPP token

089bb023

by Alan Zimmerman at 2025-04-24T18:16:56+01:00

Simplify Lexer interface. Only ITcpp

We transfer directive lines through it, then parse them from scratch
in the preprocessor.

6f9a6183

by Alan Zimmerman at 2025-04-24T18:16:56+01:00

Deal with directive on last line, with no trailing \n

c392bba5
by Alan Zimmerman at 2025-04-24T18:16:56+01:00
```
Start parsing and processing the directives
```
13e86d1f
by Alan Zimmerman at 2025-04-24T18:16:56+01:00
```
Prepare for processing include files
```

757b978b

by Alan Zimmerman at 2025-04-24T18:16:56+01:00

Move PpState into PreProcess

And initParserState, initPragState too

2aba7f93

by Alan Zimmerman at 2025-04-24T18:16:56+01:00

Process nested include files

Also move PpState out of Lexer.x, so it is easy to evolve it in a ghci
session, loading utils/check-cpp/Main.hs

d545db1d
by Alan Zimmerman at 2025-04-24T18:16:56+01:00
```
Split into separate files
```

5869fc35

by Alan Zimmerman at 2025-04-24T18:16:56+01:00

Starting on expression parser.

But it hangs. Time for Text.Parsec.Expr

370fff2e

by Alan Zimmerman at 2025-04-24T18:16:56+01:00

Start integrating the ghc-cpp work

From https://github.com/alanz/ghc-cpp

c85df867
by Alan Zimmerman at 2025-04-24T18:16:56+01:00
```
WIP
```
b8896b47
by Alan Zimmerman at 2025-04-24T18:16:56+01:00
```
Fixup after rebase
```
fef967e6
by Alan Zimmerman at 2025-04-24T18:16:56+01:00
```
WIP
```
847dd6b3
by Alan Zimmerman at 2025-04-24T18:16:56+01:00
```
Fixup after rebase, including all tests pass
```
fdc130da
by Alan Zimmerman at 2025-04-24T18:16:56+01:00
```
Change pragma usage to GHC_CPP from GhcCPP
```
bf805566
by Alan Zimmerman at 2025-04-24T18:16:56+01:00
```
Some comments
```
4965a6cb
by Alan Zimmerman at 2025-04-24T18:16:56+01:00
```
Reformat
```
0b135bc4
by Alan Zimmerman at 2025-04-24T18:16:56+01:00
```
Delete unused file
```
368f0bac
by Alan Zimmerman at 2025-04-24T18:16:56+01:00
```
Rename module Parse to ParsePP
```
272b2ee6
by Alan Zimmerman at 2025-04-24T18:16:56+01:00
```
Clarify naming in the parser
```

77cc824f

by Alan Zimmerman at 2025-04-24T18:16:56+01:00

WIP. Switching to alex/happy to be able to work in-tree

Since Parsec is not available

f8260f59

by Alan Zimmerman at 2025-04-24T18:16:56+01:00

Layering is now correct

- GHC lexer, emits CPP tokens
- accumulated in Preprocessor state
- Lexed by CPP lexer, CPP command extracted, tokens concated with
  spaces (to get rid of token pasting via comments)
- if directive lexed and parsed by CPP lexer/parser, and evaluated

bcf6df38

by Alan Zimmerman at 2025-04-24T18:16:56+01:00

First example working

Loading Example1.hs into ghci, getting the right results

```
{-# LANGUAGE GHC_CPP #-}
module Example1 where

y = 3

x =
  "hello"
  "bye now"

foo = putStrLn x
```

e21ff624

by Alan Zimmerman at 2025-04-24T18:16:56+01:00

Rebase, and all tests pass except whitespace for generated parser

d3b4779a
by Alan Zimmerman at 2025-04-24T18:16:56+01:00
```
More plumbing. Ready for testing tomorrow.
```

cbce7b1d

by Alan Zimmerman at 2025-04-24T18:16:56+01:00

Proress. Renamed module State from Types

And at first blush it seems to handle preprocessor scopes properly.

4a3bc468

by Alan Zimmerman at 2025-04-24T18:16:56+01:00

Insert basic GHC version macros into parser

__GLASGOW_HASKELL__
__GLASGOW_HASKELL_FULL_VERSION__
__GLASGOW_HASKELL_PATCHLEVEL1__
__GLASGOW_HASKELL_PATCHLEVEL2__

302b8058
by Alan Zimmerman at 2025-04-24T18:16:56+01:00
```
Re-sync check-cpp for easy ghci work
```
ea0417b6
by Alan Zimmerman at 2025-04-24T18:16:56+01:00
```
Get rid of warnings
```

7614e4a2

by Alan Zimmerman at 2025-04-24T18:16:56+01:00

Rework macro processing, in check-cpp

Macros kept at the top level, looked up via name, multiple arity
versions per name can be stored

68c7ed44

by Alan Zimmerman at 2025-04-24T18:16:56+01:00

WIP. Can crack arguments for #define

Next step it to crack out args in an expansion

dadcdb3a
by Alan Zimmerman at 2025-04-24T18:16:56+01:00
```
WIP on arg parsing.
```
c7edf420
by Alan Zimmerman at 2025-04-24T18:16:56+01:00
```
Progress. Still screwing up nested parens.
```
375ed9f2
by Alan Zimmerman at 2025-04-24T18:16:56+01:00
```
Seems to work, but has redundant code
```
268a487d
by Alan Zimmerman at 2025-04-24T18:16:56+01:00
```
Remove redundant code
```
df6e5699
by Alan Zimmerman at 2025-04-24T18:16:57+01:00
```
Reformat
```

cd62f2c6