Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
clean-ide
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
6
Issues
6
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
clean-and-itasks
clean-ide
Commits
4b4c6478
Commit
4b4c6478
authored
Oct 18, 2010
by
John van Groningen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename functions GetPath and SetPath to getProjectFilePath and setProjectFilePath,
add function getFromProject
parent
dff36665
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
32 additions
and
27 deletions
+32
-27
Ide/IDE.icl
Ide/IDE.icl
+1
-1
Ide/IdeState.dcl
Ide/IdeState.dcl
+3
-2
Ide/IdeState.icl
Ide/IdeState.icl
+8
-4
Ide/PmDialogues.icl
Ide/PmDialogues.icl
+4
-4
Ide/projmen.icl
Ide/projmen.icl
+4
-4
Ide/projwin.icl
Ide/projwin.icl
+7
-7
Ide/targetui.icl
Ide/targetui.icl
+1
-1
Pm/PmDriver.icl
Pm/PmDriver.icl
+3
-3
Win/tools.icl
Win/tools.icl
+1
-1
No files found.
Ide/IDE.icl
View file @
4b4c6478
...
...
@@ -1160,7 +1160,7 @@ Batch startup force_update proj_path initialState world
pinit
force_update
proj
proj_path
ps
#
ps
=
setInteract
False
ps
#
ps
=
setProject
proj
ps
#
ps
=
setPath
proj_path
ps
#
ps
=
setP
rojectFileP
ath
proj_path
ps
#
ps
=
selectProjectTarget
getTargets
ps
#
ps
=
ew_safe_close
ps
// close error window
#
ps
=
tw_safe_close
ps
// close types window
...
...
Ide/IdeState.dcl
View file @
4b4c6478
...
...
@@ -34,6 +34,7 @@ getProject :: !*(PSt *General) -> (Project,*PSt *General)
setProject
::
!
Project
!*(
PSt
*
General
)
->
*
PSt
*
General
appProject
::
(
Project
->
Project
)
!*(
PSt
*
General
)
->
*
PSt
*
General
accProject
::
(
Project
->
(.
a
,
Project
))
!*(
PSt
*
General
)
->
(.
a
,*
PSt
*
General
)
getFromProject
::
(
Project
->
.
a
)
!*(
PSt
*
General
)
->
(!.
a
,!*
PSt
*
General
)
getCompilerProcessIds
::
!*(
PSt
*
General
)
->
(!
CompilerProcessIds
,!*(
PSt
*
General
))
setCompilerProcessIds
::
!
CompilerProcessIds
!*(
PSt
*
General
)
->
*(
PSt
*
General
)
...
...
@@ -212,8 +213,8 @@ setFI :: !FindInfo !*(PSt *General) -> *PSt *General
//-- project path
getPath
::
!*(
PSt
*
General
)
->
(!
Pathname
,!*
PSt
*
General
)
setPath
::
!
Pathname
!*(
PSt
*
General
)
->
*
PSt
*
General
getP
rojectFileP
ath
::
!*(
PSt
*
General
)
->
(!
Pathname
,!*
PSt
*
General
)
setP
rojectFileP
ath
::
!
Pathname
!*(
PSt
*
General
)
->
*
PSt
*
General
//-- startup path
...
...
Ide/IdeState.icl
View file @
4b4c6478
...
...
@@ -86,6 +86,10 @@ accProject f ps
#
(
res
,
prj
)
=
f
prj
=
(
res
,{
ps
&
ls
.
project
=
prj
})
getFromProject
::
(
Project
->
.
a
)
!*(
PSt
*
General
)
->
(!.
a
,!*
PSt
*
General
)
getFromProject
f
ps
=:{
ls
={
project
}}
=
(
f
project
,
ps
)
getCompilerProcessIds
::
!*(
PSt
*
General
)
->
(!
CompilerProcessIds
,!*(
PSt
*
General
))
getCompilerProcessIds
ps
=
accPLoc
(\
l
->
l
!
g_compiler_process_ids
)
ps
...
...
@@ -384,11 +388,11 @@ getFI ps = accPLoc (\p=:{ed_find}->(ed_find,p)) ps
setFI
::
!
FindInfo
!*(
PSt
*
General
)
->
*
PSt
*
General
setFI
ei
ps
=
appPLoc
(\
p
->{
p
&
ed_find
=
ei
})
ps
getPath
::
!*(
PSt
*
General
)
->
(!
Pathname
,!*
PSt
*
General
)
getPath
ps
=
accPLoc
(\
p
=:{
General
|
pr_path
}->(
pr_path
,
p
))
ps
getP
rojectFileP
ath
::
!*(
PSt
*
General
)
->
(!
Pathname
,!*
PSt
*
General
)
getP
rojectFileP
ath
ps
=
accPLoc
(\
p
=:{
General
|
pr_path
}->(
pr_path
,
p
))
ps
setPath
::
!
Pathname
!*(
PSt
*
General
)
->
*
PSt
*
General
setPath
ts
ps
=
appPLoc
(\
p
->{
General
|
p
&
pr_path
=
ts
})
ps
setP
rojectFileP
ath
::
!
Pathname
!*(
PSt
*
General
)
->
*
PSt
*
General
setP
rojectFileP
ath
ts
ps
=
appPLoc
(\
p
->{
General
|
p
&
pr_path
=
ts
})
ps
getStup
::
!*(
PSt
*
General
)
->
(!
Pathname
,!*
PSt
*
General
)
getStup
ps
=
accPLoc
(\
p
=:{
pr_stup
}->(
pr_stup
,
p
))
ps
...
...
Ide/PmDialogues.icl
View file @
4b4c6478
...
...
@@ -40,7 +40,7 @@ projectDialog actualProject ps`
#(
dp
,
ps
)
=
getCurrentPaths
ps
#
prj
=
PR_SetPaths
False
dp
ret
.
paths
prj
#
(
appPath
,
ps
)
=
getStup
ps
#
(
prjPath
,
ps
)
=
getPath
ps
#
(
prjPath
,
ps
)
=
getP
rojectFileP
ath
ps
#
prjPath
=
RemoveFilename
prjPath
#
prj
=
PR_SetExecPath
ret
.
xp
prj
#
prj
=
PR_SetStaticLibsInfo
ret
.
sl
prj
...
...
@@ -83,7 +83,7 @@ where
(
lbdlibId
,
ps4
)
=
openExtListBoxId
ps3
(
lbslibId
,
ps5
)
=
openExtListBoxId
ps4
(
ap
,
ps6
)
=
getStup
ps5
(
pp
,
ps7
)
=
fix
(
getPath
ps6
)
where
fix
(
l
,
r
)
=
(
RemoveFilename
l
,
r
)
(
pp
,
ps7
)
=
fix
(
getP
rojectFileP
ath
ps6
)
where
fix
(
l
,
r
)
=
(
RemoveFilename
l
,
r
)
(
prefs
,
ps
)
=
PlatformDependant
(
getPrefs
ps7
)
// Win
(
getPrefs
ps9
)
// Mac
...
...
@@ -168,7 +168,7 @@ where
symexepath
=
symPath
ap
pp
fulexepath
setexe
(
ls
,
ps
)
#
(
prjPath
,
ps
)
=
getPath
ps
#
(
prjPath
,
ps
)
=
getP
rojectFileP
ath
ps
#
prjName
=
RemoveSuffix
(
RemovePath
prjPath
)
#
prjPath
=
RemoveFilename
prjPath
#
(
exename
,
ps
)
=
PlatformDependant
...
...
@@ -395,7 +395,7 @@ where
make_sym_path
name
ps
#
(
appPath
,
ps
)
=
getStup
ps
#
(
prjPath
,
ps
)
=
getPath
ps
#
(
prjPath
,
ps
)
=
getP
rojectFileP
ath
ps
#
prjPath
=
RemoveFilename
prjPath
=
(
symPath
appPath
prjPath
name
,
ps
)
...
...
Ide/projmen.icl
View file @
4b4c6478
...
...
@@ -205,7 +205,7 @@ pm_new` path projectpath ps
lo
=
prefs
.
linkopts
//DefaultLinkOptions
ao
=
prefs
.
applopts
//DefApplicationOptions
project
=
PR_NewProject
path
eo
co
go
ao
Nil
lo
ps
=
setPath
projectpath
ps
ps
=
setP
rojectFileP
ath
projectpath
ps
project
=
PR_SetRoot
path
eo
co
project
// ensure correct root path in project
ps
=
appProject
(
const
project
)
ps
ps
=
pm_set_window_title
projectpath
ps
...
...
@@ -246,7 +246,7 @@ pm_open_cont file ps
*/
pm_switch
::
!.
Pathname
!*(
PSt
*
General
)
->
(!
Bool
,!*
PSt
*
General
);
pm_switch
pathname
ps
#
(
oldpath
,
ps
)
=
getPath
ps
#
(
oldpath
,
ps
)
=
getP
rojectFileP
ath
ps
#
(
ok
,
ps
)
=
close_all_project_windows
(
pm_switch`
pathname
)
ps
|
not
ok
&&
oldpath
<>
""
#
(_,
ps
)
=
pm_actual_open
oldpath
ps
...
...
@@ -266,7 +266,7 @@ pm_actual_open pathname ps
|
not
ok
=
(
ok
,
okNotice
[
err
]
ps
)
#
ps
=
appProject
(
const
project
)
ps
#
ps
=
setPath
pathname
ps
#
ps
=
setP
rojectFileP
ath
pathname
ps
// # name = RemovePath pathname
#
ps
=
pm_set_window_title
pathname
ps
#
ps
=
selectProjectTarget
getTargets
ps
...
...
@@ -291,7 +291,7 @@ pm_shut ps
#
ps
=
pm_save
ps
#
ps
=
appProject
(
const
PR_InitProject
)
ps
#
ps
=
closeAllExtListBoxItems
lbId
ps
#
ps
=
setPath
""
ps
#
ps
=
setP
rojectFileP
ath
""
ps
// fixup menus
=
ps
...
...
Ide/projwin.icl
View file @
4b4c6478
...
...
@@ -479,7 +479,7 @@ pm_update_project_window_interactive ps
// # ps = trace_n` ("mdomain`",ok,mdomain`) ps
#
(
srcpaths
,
ps
)
=
getProjwinPaths
ps
#
(
appPath
,
ps
)
=
getStup
ps
#
(
prjPath
,
ps
)
=
getPath
ps
#
(
prjPath
,
ps
)
=
getP
rojectFileP
ath
ps
#
prjPath
=
RemoveFilename
prjPath
#
lbItems
=
items
srcpaths
appPath
prjPath
modules
prefs
.
prj_prefs
.
proj_shft
#
ps
=
appendExtListBoxItems
lbId
lbItems
ps
...
...
@@ -731,7 +731,7 @@ where
|
not
ok
=
ps
#
(
lo
,
ps
)
=
accProject
(\
project
->(
PR_GetLinkOptions
project
,
project
))
ps
#
(
prj_path
,
ps
)
=
getPath
ps
#
(
prj_path
,
ps
)
=
getP
rojectFileP
ath
ps
#
(
app_path
,
ps
)
=
getStup
ps
#
prj_path`
=
RemoveFilename
prj_path
#
execpath
=
fulPath
app_path
prj_path`
execpath
...
...
@@ -743,7 +743,7 @@ where
pm_run
::
!*(
PSt
*
General
)
->
*
PSt
*
General
;
pm_run
ps
#
(
app_path
,
ps
)
=
getStup
ps
#
(
prj_path
,
ps
)
=
getPath
ps
#
(
prj_path
,
ps
)
=
getP
rojectFileP
ath
ps
#
(
execpath
,
ps
)
=
accProject
(\
l
->(
PR_GetExecPath
l
,
l
))
ps
#
prj_path`
=
RemoveFilename
prj_path
#
execpath
=
fulPath
app_path
prj_path`
execpath
...
...
@@ -907,7 +907,7 @@ pm_save_as ps
|
isNothing
pn
=
ps
#
pn
=
fromJust
pn
#
ps
=
setPath
pn
ps
#
ps
=
setP
rojectFileP
ath
pn
ps
#
ps
=
pm_save
ps
#
(
recId
,
ps
)
=
getPHI
ps
#
(_,
ps
)
=
syncSend2
recId
pn
ps
...
...
@@ -928,7 +928,7 @@ pm_save_copy_as ps
pm_save
::
!*(
PSt
*
General
)
->
*
PSt
*
General
pm_save
ps
#
(
project
,
ps
)
=
accProject
(\
l
->(
l
,
l
))
ps
(
pathname
,
ps
)
=
getPath
ps
(
pathname
,
ps
)
=
getP
rojectFileP
ath
ps
#
(
project
,
ps
)
=
pm_save_common
pathname
project
ps
#
project
=
PR_SetSaved
project
ps
=
appProject
(
const
project
)
ps
...
...
@@ -1002,7 +1002,7 @@ keyboard (CharKey '+' (KeyDown False)) ((lbState=:{tMargin,listboxId,selection,i
|
not
hasSelection
=
((
lbState
,
ls
),
ps
)
#
(
appPath
,
ps
)
=
getStup
ps
#
(
prjPath
,
ps
)
=
getPath
ps
#
(
prjPath
,
ps
)
=
getP
rojectFileP
ath
ps
#
ps
=
updFstate`
(
map
(\(
p
,
b
)->
(
fulPath
appPath
prjPath
p
,
b
))
selItems
)
ps
#
ps
=
pm_update_project_window_interactive
ps
=
((
lbState
,
ls
),
ps
)
...
...
@@ -1018,7 +1018,7 @@ keyboard (CharKey '-' (KeyDown False)) ((lbState=:{tMargin,listboxId,selection,i
|
not
hasSelection
=
((
lbState
,
ls
),
ps
)
#
(
appPath
,
ps
)
=
getStup
ps
#
(
prjPath
,
ps
)
=
getPath
ps
#
(
prjPath
,
ps
)
=
getP
rojectFileP
ath
ps
#
ps
=
updFstate`
(
map
(\(
p
,
b
)->
(
fulPath
appPath
prjPath
p
,
b
))
selItems
)
ps
#
ps
=
pm_update_project_window_interactive
ps
=
((
lbState
,
ls
),
ps
)
...
...
Ide/targetui.icl
View file @
4b4c6478
...
...
@@ -389,7 +389,7 @@ buttonWidth = ContentWidth "Append..."
editTargets
getTs
setTs
ps
#
(
ap
,
ps
)
=
getStup
ps
#
(
pp
,
ps
)
=
getPath
ps
#
(
pp
,
ps
)
=
getP
rojectFileP
ath
ps
#
pp
=
RemoveFilename
pp
#
(
ts
,
ps
)
=
getTs
ps
#
(
ct
,
ps
)
=
getCurrentTarget
ps
...
...
Pm/PmDriver.icl
View file @
4b4c6478
...
...
@@ -169,7 +169,7 @@ where
#
(
postlink
,
project
)
=
PR_GetPostlink
project
|
isJust
postlink
#
(
Just
post_link
)
=
postlink
#
(
prj_path
,
ps
)
=
getPath
ps
#
(
prj_path
,
ps
)
=
getP
rojectFileP
ath
ps
#
prj_dir_path
=
RemoveFilename
prj_path
#
(
app_path
,
ps
)
=
getStup
ps
#
post_link
=
fulPath
app_path
prj_dir_path
post_link
...
...
@@ -796,7 +796,7 @@ step intr (DLink ds=:{ok, newpaths, fileinfo, libsinfo, modpaths, abccache, proj
|
intr
||
not
ok
=
continue
False
newpaths
False
fileinfo
libsinfo
modpaths
project
intr
(
abccache
,
ps
)
#
lo
=
PR_GetLinkOptions
project
#
(
prj_path
,
ps
)
=
getPath
ps
#
(
prj_path
,
ps
)
=
getP
rojectFileP
ath
ps
#
(
app_path
,
ps
)
=
getStup
ps
#
(
defpaths
,
ps
)
=
getCurrentPaths
ps
#
prjpaths
=
PR_GetPaths
project
...
...
@@ -1374,7 +1374,7 @@ where
NewPathsDialog
::
!
String
!
String
!
Project
!*
GeneralSt
->
*(*
GeneralSt
,
Project
,
Bool
)
NewPathsDialog
module_name
path
project
ps
#
(
ap
,
ps
)
=
getStup
ps
#
(
pp
,
ps
)
=
getPath
ps
#
(
pp
,
ps
)
=
getP
rojectFileP
ath
ps
#
(
defp
,
ps
)
=
getCurrentPaths
ps
#
prjpaths
=
PR_GetPaths
project
#
pp
=
RemoveFilename
pp
...
...
Win/tools.icl
View file @
4b4c6478
...
...
@@ -73,7 +73,7 @@ provefun :: !*(PSt General) -> *PSt General
provefun
ps
#
ps
=
pm_save
ps
// ensure project file is recent...
#
(
pathname
,
ps
)
=
getPath
ps
#
(
pathname
,
ps
)
=
getP
rojectFileP
ath
ps
#
pr_path
=
quoted_string
(
RemoveSuffix`
pathname
+++.
proofsuf
)
#
(
prefs
,
ps
)
=
getPrefs
ps
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment