diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2014-07-15 01:42:19 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2014-07-15 01:42:19 +0200 |
| commit | 18ded6c23d72cd21fa0aa10ff61dc6f9af40832c (patch) | |
| tree | 5d681c9835f01019e8ae83e14c0cd49d1a6c0d38 /compiler/semdata.nim | |
| parent | 687a1b7de4c006750274fb046a10f08d38c22f5a (diff) | |
| parent | 41bb0bf9dcccdfcebdb0f823fea8b2853b89ea4e (diff) | |
| download | Nim-18ded6c23d72cd21fa0aa10ff61dc6f9af40832c.tar.gz | |
Merge pull request #1363 from Araq/devel
Merge devel into master
Diffstat (limited to 'compiler/semdata.nim')
| -rw-r--r-- | compiler/semdata.nim | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/semdata.nim b/compiler/semdata.nim index 987a70a41..abecc1b6d 100644 --- a/compiler/semdata.nim +++ b/compiler/semdata.nim @@ -52,7 +52,7 @@ type importTable*: PScope # scope for all imported symbols topLevelScope*: PScope # scope for all top-level symbols p*: PProcCon # procedure context - friendModule*: PSym # current friend module; may access private data; + friendModules*: seq[PSym] # friend modules; may access private data; # this is used so that generic instantiations # can access private object fields instCounter*: int # to prevent endless instantiations @@ -91,6 +91,7 @@ type generics*: seq[TInstantiationPair] # pending list of instantiated generics to compile lastGenericIdx*: int # used for the generics stack hloLoopDetector*: int # used to prevent endless loops in the HLO + inParallelStmt*: int proc makeInstPair*(s: PSym, inst: PInstantiation): TInstantiationPair = result.genericSym = s @@ -168,7 +169,7 @@ proc newContext(module: PSym): PContext = initLinkedList(result.libs) append(result.optionStack, newOptionEntry()) result.module = module - result.friendModule = module + result.friendModules = @[module] result.converters = @[] result.patterns = @[] result.includedFiles = initIntSet() |