Skip to content

Commit 2d27820

Browse files
committed
Comment wip package manager
Signed-off-by: George Lemon <[email protected]>
1 parent 109c679 commit 2d27820

File tree

2 files changed

+29
-28
lines changed

2 files changed

+29
-28
lines changed

src/timpkg/engine/meta.nim

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import pkg/importer/resolver
1313
export getProjectPath
1414

1515
from ./ast import Ast
16-
from ./package/manager import Packager, loadPackages
16+
# from ./package/manager import Packager, loadPackages
1717

1818
var placeholderLocker*: Lock
1919

@@ -58,7 +58,7 @@ type
5858
policy: TimPolicy
5959
globals: JsonNode = newJObject()
6060
importsHandle*: Resolver
61-
packager*: Packager
61+
# packager*: Packager
6262

6363
TimEngineSnippets* = TableRef[string, seq[Ast]]
6464
TimError* = object of CatchableError
@@ -375,9 +375,9 @@ proc newTim*(src, output, basepath: string, minify = true,
375375
minify: minify,
376376
indentSize: indent,
377377
htmlErrors: showHtmlError,
378-
packager: Packager()
378+
# packager: Packager()
379379
)
380-
result.packager.loadPackages()
380+
# result.packager.loadPackages()
381381
for sourceDir in [ttLayout, ttView, ttPartial]:
382382
if not dirExists(result.src / $sourceDir):
383383
raise newException(TimError, "Missing $1 directory: \n$2" % [$sourceDir, result.src / $sourceDir])

src/timpkg/engine/parser.nim

+25-24
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import std/[macros, macrocache, streams, lexbase,
99
strutils, sequtils, re, tables, os, with, options]
1010

11-
import ./meta, ./tokens, ./ast, ./logging,
12-
./std, ./package/manager
11+
import ./meta, ./tokens, ./ast, ./logging, ./std
12+
# import ./package/manager
1313

1414
import pkg/kapsis/cli
1515
import pkg/importer
@@ -1117,20 +1117,21 @@ prefixHandle pImport:
11171117
p.engine.parseModule(p.curr.value, std(p.curr.value)[1])
11181118
p.tree.modules[p.curr.value].src = p.curr.value
11191119
elif p.curr.value.startsWith("pkg/"):
1120-
if likely(p.engine.packager.hasPackage(p.curr.value[4..^1].split("/")[0])):
1121-
# var moduleAst: Ast
1122-
# if likely(p.engine.packager.flagNoCache == false):
1123-
# moduleAst = p.engine.packager.getCachedModule(p.curr.value)
1124-
# if moduleAst != nil:
1125-
# p.tree.modules[p.curr.value] = moduleAst
1126-
# else:
1127-
let moduleCode = p.engine.packager.loadModule(p.curr.value)
1128-
let moduleAst = p.engine.parseModule(p.curr.value, SourceCode(moduleCode))
1129-
p.tree.modules[p.curr.value] = moduleAst
1130-
# if p.engine.packager.flagNoCache == false:
1131-
# p.engine.packager.cacheModule(p.curr.value, moduleAst)
1132-
else:
1133-
errorWithArgs(importError, p.curr, [p.curr.value.addFileExt(".timl")])
1120+
discard # todo
1121+
# if likely(p.engine.packager.hasPackage(p.curr.value[4..^1].split("/")[0])):
1122+
# # var moduleAst: Ast
1123+
# # if likely(p.engine.packager.flagNoCache == false):
1124+
# # moduleAst = p.engine.packager.getCachedModule(p.curr.value)
1125+
# # if moduleAst != nil:
1126+
# # p.tree.modules[p.curr.value] = moduleAst
1127+
# # else:
1128+
# let moduleCode = p.engine.packager.loadModule(p.curr.value)
1129+
# let moduleAst = p.engine.parseModule(p.curr.value, SourceCode(moduleCode))
1130+
# p.tree.modules[p.curr.value] = moduleAst
1131+
# # if p.engine.packager.flagNoCache == false:
1132+
# # p.engine.packager.cacheModule(p.curr.value, moduleAst)
1133+
# else:
1134+
# errorWithArgs(importError, p.curr, [p.curr.value.addFileExt(".timl")])
11341135
else:
11351136
let path =
11361137
(if not isAbsolute(p.curr.value):
@@ -1896,13 +1897,13 @@ proc parseSnippet*(id, code: string,
18961897
logger: Logger(filePath: id),
18971898
engine: TimEngine(
18981899
`type`: TimEngineRuntime.runtimePassAndExit,
1899-
packager: Packager(
1900-
flagNoCache: noCache,
1901-
flagRecache: reCache
1902-
)
1900+
# packager: Packager(
1901+
# flagNoCache: noCache,
1902+
# flagRecache: reCache
1903+
# )
19031904
),
19041905
)
1905-
p.engine.packager.loadPackages()
1906+
# p.engine.packager.loadPackages()
19061907
p.curr = p.lex.getToken()
19071908
p.next = p.lex.getToken()
19081909
initModuleSystem()
@@ -1931,9 +1932,9 @@ proc parseSnippet*(snippetPath: string): Parser {.gcsafe.} =
19311932
logger: Logger(filePath: snippetPath),
19321933
engine: TimEngine(
19331934
`type`: TimEngineRuntime.runtimePassAndExit,
1934-
packager: Packager(
1935-
flagNoCache: true
1936-
)
1935+
# packager: Packager(
1936+
# flagNoCache: true
1937+
# )
19371938
),
19381939
)
19391940
p.curr = p.lex.getToken()

0 commit comments

Comments
 (0)