Commits

Sterling Camden  committed 2488c86

Compatibility for Windows.

  • Participants
  • Parent commits 8547202

Comments (0)

Files changed (5)

File sources/makefile.mak

 SOURCES = assertions commandline compare console coverage elapsedtime fif file gottk \
 hash json let ls mapper mapvar memo multisignal oi progn random reducer regex socket telnet transport var version
 SOURCES_NET = assertions var commandline compare console elapsedtime fif file gottk \
-hash json let ls mapper mapvar memo oi progn random reducer regex socket telnet transport version
+hash json let ls mapper mapvar memo multisignal oi progn random reducer regex socket telnet transport version
 
 clean:
 	%PushDir $(PROTO)

File sources/multisignal.dbl

 	proc
 	  sentnam = entnam
 	  MultiSignal.list.add(sentnam.ToUpper())
+.ifdef DBLNET
+	  mreturn xsubr("m_signal", entnam)
+.else
 	  mreturn m_signal(entnam)
+.endc
 	end
 
 	public static method remove, string	;Dequeue an event

File tests/makefile.mak

 $[f,exe,test_multisignal,dbr]:	$[f,obj,test_multisignal,dbo]
 	dblink $(DBG) -o $(_Target) $(_Source) $(LIBS) WND:tklib.elb
 $[f,exe,test_multisignal,exe]:	$[f,,test_multisignal,dbl]
-	dblnet $(DBG) -out=$(Target) -target=exe -ref=$[f,exe,synthesis,dll] -ref=$[f,$(DBLDIR)\bin,Synergex.SynergyDE.tklib,dll] 
+	dblnet $(DBG) -out=$(_Target) -target=exe -ref=$[f,exe,synthesis,dll] -ref=$(DBLDIR)\bin\Synergex.SynergyDE.tklib.dll $(_Source)
 
 .dbo.dbr:
 	dblink $(DBG) -o $(_Target) $(_Source) $(LIBS)

File tests/test_ls.dbl

 	&		  (ls.of(4) & 5))
 	assert(ls1.count == 2)
 	assert(((ls)(ls1.car)).count == 2)
-	assert((var)(((ls)(ls1.car)).car) == 1)
+	ls2 = (ls)(ls1.car)
+	assert((var)(ls2.car) == 1)
 	assert(((ls)(ls1[1])).count == 2)
-	assert((var)(((ls)(ls1[1])).car) == 3)
+	ls2 =(ls)(ls1[1])
+	assert((var)(ls2.car) == 3)
 	ls2 = ls1.flatten()
 	assert(ls2.count == 5)
 	for ndx from 1 thru 5

File tests/test_regex.dbl

 	  r1 = r$('/[[:alpha:]]/g')
 	  assert_equal('  #55', r1.replace('Hey there #55', ''))
 	  r1 = r$('/[[:ascii:]]/g')
+.ifndef DBLNET		;.NET doesn't handle >127 to string conversion
 	  assert_equal(%char(128), r1.replace(%char(0) + 'abc~' + %char(128), ''))
+.endc
 	  r1 = r$('/[[:blank:]]/g')
 	  assert_equal('Hellotheretab', r1.replace('Hello there'+%char(9)+'tab', ''))
 	  r1 = r$('/[[:cntrl:]]/g')